diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..9d63bfa4 --- /dev/null +++ b/.travis.yml @@ -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 \ No newline at end of file diff --git a/Gemfile b/Gemfile index 66653d80..ebb2d583 100644 --- a/Gemfile +++ b/Gemfile @@ -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' @@ -66,10 +65,8 @@ group :development do # DOCS gem 'yard', require: nil gem 'redcarpet', require: nil, platform: :mri - gem 'fdoc' end - group :test do # SPECS gem 'rspec-rails' @@ -77,4 +74,7 @@ group :test do gem 'fakeweb' end -gem 'sql_origin', groups: [:development, :test] +group :test, :development do + gem 'fdoc' + gem 'sql_origin' +end diff --git a/Gemfile.lock b/Gemfile.lock index 4559daf7..3e6d0b41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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 diff --git a/config/database.travis.yml b/config/database.travis.yml new file mode 100644 index 00000000..8b91559f --- /dev/null +++ b/config/database.travis.yml @@ -0,0 +1,4 @@ +test: + adapter: postgresql + database: myapp_test + username: postgres \ No newline at end of file