Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
language: ruby
bundler_args: --without development:assets:production
rvm:
- 1.9.3
- jruby-19mode
before_script:
- cp -f config/database.travis.yml config/database.yml
- RAILS_ENV=test rake db:create db:migrate db:test:prepare
script: bundle exec rspec spec
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ gem 'rack-cors', require: 'rack/cors'

# MODELS
gem 'pg', platform: :mri
# Version 1.2.6 introduces a bug relating to SQL binds
gem 'activerecord-jdbc-adapter', '1.2.5', platform: :jruby
gem 'activerecord-jdbc-adapter', '1.2.7', platform: :jruby
gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
gem 'has_metadata_column', git: 'git://github.com/RISCfuture/has_metadata_column.git'
gem 'slugalicious'
Expand Down Expand Up @@ -66,15 +65,16 @@ group :development do
# DOCS
gem 'yard', require: nil
gem 'redcarpet', require: nil, platform: :mri
gem 'fdoc'
end


group :test do
# SPECS
gem 'rspec-rails'
gem 'factory_girl_rails'
gem 'fakeweb'
end

gem 'sql_origin', groups: [:development, :test]
group :test, :development do
gem 'fdoc'
gem 'sql_origin'
end
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ GIT
GEM
remote: https://rubygems.org/
specs:
activerecord-jdbc-adapter (1.2.5)
activerecord-jdbcpostgresql-adapter (1.2.5)
activerecord-jdbc-adapter (~> 1.2.5)
activerecord-jdbc-adapter (1.2.7)
activerecord-jdbcpostgresql-adapter (1.2.7)
activerecord-jdbc-adapter (~> 1.2.7)
jdbc-postgres (>= 9.1, < 9.3)
activerecord-postgresql-cursors (0.0.2)
addressable (2.3.2)
Expand Down Expand Up @@ -241,7 +241,7 @@ PLATFORMS
ruby

DEPENDENCIES
activerecord-jdbc-adapter (= 1.2.5)
activerecord-jdbc-adapter (= 1.2.7)
activerecord-jdbcpostgresql-adapter
activerecord-postgresql-cursors
coffee-rails
Expand Down
4 changes: 4 additions & 0 deletions config/database.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
test:
adapter: postgresql
database: myapp_test
username: postgres