Skip to content

Commit

Permalink
Test against newer versions of rails
Browse files Browse the repository at this point in the history
  • Loading branch information
albus522 committed Oct 24, 2014
1 parent b3adaee commit 7b7dddb
Show file tree
Hide file tree
Showing 10 changed files with 163 additions and 9 deletions.
22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,21 @@ gemfile:
- gemfiles/mysql/3-1.gemfile
- gemfiles/mysql/3-2.gemfile
- gemfiles/mysql/4-0.gemfile
- gemfiles/mysql/4-1.gemfile
- gemfiles/mysql/4-2.gemfile
- gemfiles/postgresql/3-0.gemfile
- gemfiles/postgresql/3-1.gemfile
- gemfiles/postgresql/3-2.gemfile
- gemfiles/postgresql/4-0.gemfile
- gemfiles/postgresql/4-1.gemfile
- gemfiles/postgresql/4-2.gemfile
- gemfiles/sqlite3/3-0.gemfile
- gemfiles/sqlite3/3-1.gemfile
- gemfiles/sqlite3/3-2.gemfile
- gemfiles/sqlite3/4-0.gemfile
- gemfiles/sqlite3/4-0-protected_attributes.gemfile
- gemfiles/sqlite3/4-1.gemfile
- gemfiles/sqlite3/4-2.gemfile
rvm:
- 1.9.3
- 2.0.0
Expand All @@ -34,4 +40,20 @@ matrix:
- rvm: jruby-head
- rvm: rbx-2
- rvm: ruby-head
- gemfile: gemfiles/mysql/4-2.gemfile
- gemfile: gemfiles/postgresql/4-2.gemfile
- gemfile: gemfiles/sqlite3/4-2.gemfile
exclude:
- gemfile: gemfiles/mysql/4-1.gemfile
rvm: 1.9.3
- gemfile: gemfiles/mysql/4-2.gemfile
rvm: 1.9.3
- gemfile: gemfiles/postgresql/4-1.gemfile
rvm: 1.9.3
- gemfile: gemfiles/postgresql/4-2.gemfile
rvm: 1.9.3
- gemfile: gemfiles/sqlite3/4-1.gemfile
rvm: 1.9.3
- gemfile: gemfiles/sqlite3/4-2.gemfile
rvm: 1.9.3
sudo: false
4 changes: 1 addition & 3 deletions gemfiles/mysql/4-0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ group :test do
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.0.0.beta"

gem 'delayed_job', "~> 4.0.0.beta"
gem 'activerecord', "~> 4.0.0"
end

gemspec :path => "../../"
23 changes: 23 additions & 0 deletions gemfiles/mysql/4-1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'activerecord-jdbc-adapter'
gem 'activerecord-jdbcmysql-adapter'
gem 'jdbc-mysql'
end

platforms :ruby, :mswin, :mingw do
gem 'mysql', '~> 2.9'
end

gem 'coveralls', :require => false
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.1.0"
end

gemspec :path => "../../"
23 changes: 23 additions & 0 deletions gemfiles/mysql/4-2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'activerecord-jdbc-adapter'
gem 'activerecord-jdbcmysql-adapter'
gem 'jdbc-mysql'
end

platforms :ruby, :mswin, :mingw do
gem 'mysql', '~> 2.9'
end

gem 'coveralls', :require => false
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.2.0.beta1"
end

gemspec :path => "../../"
4 changes: 1 addition & 3 deletions gemfiles/postgresql/4-0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ group :test do
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.0.0.beta"

gem 'delayed_job', "~> 4.0.0.beta"
gem 'activerecord', "~> 4.0.0"
end

gemspec :path => "../../"
23 changes: 23 additions & 0 deletions gemfiles/postgresql/4-1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'activerecord-jdbc-adapter'
gem 'activerecord-jdbcpostgresql-adapter'
gem 'jdbc-postgres'
end

platforms :ruby, :mswin, :mingw do
gem 'pg'
end

gem 'coveralls', :require => false
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.1.0"
end

gemspec :path => "../../"
23 changes: 23 additions & 0 deletions gemfiles/postgresql/4-2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'activerecord-jdbc-adapter'
gem 'activerecord-jdbcpostgresql-adapter'
gem 'jdbc-postgres'
end

platforms :ruby, :mswin, :mingw do
gem 'pg'
end

gem 'coveralls', :require => false
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.2.0.beta1"
end

gemspec :path => "../../"
4 changes: 1 addition & 3 deletions gemfiles/sqlite3/4-0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ group :test do
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.0.0.beta"

gem 'delayed_job', "~> 4.0.0.beta"
gem 'activerecord', "~> 4.0.0"
end

gemspec :path => "../../"
23 changes: 23 additions & 0 deletions gemfiles/sqlite3/4-1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'jruby-openssl'
gem 'activerecord-jdbc-adapter'
gem 'activerecord-jdbcsqlite3-adapter'
end

platforms :ruby, :mswin, :mingw do
gem 'sqlite3'
end

gem 'coveralls', :require => false
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.1.0"
end

gemspec :path => "../../"
23 changes: 23 additions & 0 deletions gemfiles/sqlite3/4-2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
source 'https://rubygems.org'

gem 'rake'

group :test do
platforms :jruby do
gem 'jruby-openssl'
gem 'activerecord-jdbc-adapter'
gem 'activerecord-jdbcsqlite3-adapter'
end

platforms :ruby, :mswin, :mingw do
gem 'sqlite3'
end

gem 'coveralls', :require => false
gem 'rspec', '>= 2.11'
gem 'simplecov', :require => false

gem 'activerecord', "~> 4.2.0.beta1"
end

gemspec :path => "../../"

0 comments on commit 7b7dddb

Please sign in to comment.