mirror of
https://github.com/thoughtbot/factory_bot_rails.git
synced 2022-11-09 11:49:18 -05:00
Bump versions of Ruby and Rails to test on Travis
* support latest Ruby 2.1 * support latest Ruby 2.2 * support latest Rails 4.2 * drop testing of Ruby 2.0 * drop testing of Rails 4.0 * fix JRuby support
This commit is contained in:
parent
531e68193f
commit
8c16ae46e8
8 changed files with 88 additions and 47 deletions
11
.travis.yml
11
.travis.yml
|
@ -1,9 +1,10 @@
|
||||||
language: ruby
|
language: ruby
|
||||||
|
before_install:
|
||||||
|
- gem update --system
|
||||||
cache: bundler
|
cache: bundler
|
||||||
rvm:
|
rvm:
|
||||||
- 1.9.3
|
- 2.1.5
|
||||||
- 2.0.0
|
- 2.2.1
|
||||||
- 2.1.2
|
|
||||||
- jruby-19mode
|
- jruby-19mode
|
||||||
jdk:
|
jdk:
|
||||||
- openjdk6
|
- openjdk6
|
||||||
|
@ -12,9 +13,7 @@ branches:
|
||||||
- master
|
- master
|
||||||
install:
|
install:
|
||||||
- "travis_retry bundle install"
|
- "travis_retry bundle install"
|
||||||
- "bundle exec appraisal generate"
|
|
||||||
- "travis_retry bundle exec appraisal install"
|
|
||||||
gemfile:
|
gemfile:
|
||||||
- gemfiles/rails3.2.gemfile
|
- gemfiles/rails3.2.gemfile
|
||||||
- gemfiles/rails4.0.gemfile
|
|
||||||
- gemfiles/rails4.1.gemfile
|
- gemfiles/rails4.1.gemfile
|
||||||
|
- gemfiles/rails4.2.gemfile
|
||||||
|
|
15
Appraisals
15
Appraisals
|
@ -1,16 +1,15 @@
|
||||||
# These are the versions of Rails we want to test against.
|
# These are the versions of Rails we want to test against.
|
||||||
appraise 'rails3.2' do
|
appraise 'rails3.2' do
|
||||||
gem 'rails', '~> 3.2.18'
|
gem 'rails', '~> 3.2.21'
|
||||||
gem 'sass-rails'
|
|
||||||
end
|
|
||||||
|
|
||||||
appraise 'rails4.0' do
|
|
||||||
gem 'rails', '~> 4.0.5'
|
|
||||||
gem 'sass-rails'
|
gem 'sass-rails'
|
||||||
end
|
end
|
||||||
|
|
||||||
appraise 'rails4.1' do
|
appraise 'rails4.1' do
|
||||||
gem 'rails', '~> 4.1.1'
|
gem 'rails', '~> 4.1.9'
|
||||||
gem 'sass-rails', '~> 4.0.3'
|
gem 'sass-rails'
|
||||||
gem 'spring'
|
gem 'spring'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
appraise 'rails4.2' do
|
||||||
|
gem 'rails', '~> 4.2.0'
|
||||||
|
end
|
||||||
|
|
14
Gemfile
14
Gemfile
|
@ -10,11 +10,11 @@ gem 'jquery-rails'
|
||||||
gem 'rake'
|
gem 'rake'
|
||||||
gem 'rspec-rails'
|
gem 'rspec-rails'
|
||||||
gem 'uglifier'
|
gem 'uglifier'
|
||||||
|
gem 'test-unit'
|
||||||
|
|
||||||
if RUBY_PLATFORM == 'java'
|
gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
|
||||||
gem 'activerecord-jdbcsqlite3-adapter'
|
gem 'jdbc-sqlite3', platforms: :jruby
|
||||||
gem 'jdbc-sqlite3'
|
gem 'therubyrhino', platforms: :jruby
|
||||||
gem 'therubyrhino'
|
gem 'jruby-openssl', platforms: :jruby
|
||||||
else
|
|
||||||
gem 'sqlite3'
|
gem 'sqlite3', platforms: :ruby
|
||||||
end
|
|
||||||
|
|
33
Gemfile.lock
33
Gemfile.lock
|
@ -20,16 +20,26 @@ GEM
|
||||||
activemodel (4.1.1)
|
activemodel (4.1.1)
|
||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
|
activerecord (4.1.1)
|
||||||
|
activemodel (= 4.1.1)
|
||||||
|
activesupport (= 4.1.1)
|
||||||
|
arel (~> 5.0.0)
|
||||||
|
activerecord-jdbc-adapter (1.3.15)
|
||||||
|
activerecord (>= 2.2)
|
||||||
|
activerecord-jdbcsqlite3-adapter (1.3.15)
|
||||||
|
activerecord-jdbc-adapter (~> 1.3.15)
|
||||||
|
jdbc-sqlite3 (>= 3.7.2, < 3.9)
|
||||||
activesupport (4.1.1)
|
activesupport (4.1.1)
|
||||||
i18n (~> 0.6, >= 0.6.9)
|
i18n (~> 0.6, >= 0.6.9)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
appraisal (1.0.0)
|
appraisal (1.0.3)
|
||||||
bundler
|
bundler
|
||||||
rake
|
rake
|
||||||
thor (>= 0.14.0)
|
thor (>= 0.14.0)
|
||||||
|
arel (5.0.1.20140414130214)
|
||||||
aruba (0.5.4)
|
aruba (0.5.4)
|
||||||
childprocess (>= 0.3.6)
|
childprocess (>= 0.3.6)
|
||||||
cucumber (>= 1.1.1)
|
cucumber (>= 1.1.1)
|
||||||
|
@ -56,16 +66,23 @@ GEM
|
||||||
factory_girl (4.5.0)
|
factory_girl (4.5.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
ffi (1.9.3)
|
ffi (1.9.3)
|
||||||
|
ffi (1.9.3-java)
|
||||||
gherkin (2.12.2)
|
gherkin (2.12.2)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
|
gherkin (2.12.2-java)
|
||||||
|
multi_json (~> 1.3)
|
||||||
i18n (0.6.9)
|
i18n (0.6.9)
|
||||||
|
jdbc-sqlite3 (3.8.7)
|
||||||
jquery-rails (3.1.0)
|
jquery-rails (3.1.0)
|
||||||
railties (>= 3.0, < 5.0)
|
railties (>= 3.0, < 5.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
|
jruby-openssl (0.9.6-java)
|
||||||
json (1.8.1)
|
json (1.8.1)
|
||||||
|
json (1.8.1-java)
|
||||||
minitest (5.3.4)
|
minitest (5.3.4)
|
||||||
multi_json (1.11.0)
|
multi_json (1.11.0)
|
||||||
multi_test (0.1.2)
|
multi_test (0.1.2)
|
||||||
|
power_assert (0.2.3)
|
||||||
rack (1.5.2)
|
rack (1.5.2)
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
|
@ -74,7 +91,7 @@ GEM
|
||||||
activesupport (= 4.1.1)
|
activesupport (= 4.1.1)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.3.2)
|
rake (10.4.2)
|
||||||
rspec-core (2.14.8)
|
rspec-core (2.14.8)
|
||||||
rspec-expectations (2.14.5)
|
rspec-expectations (2.14.5)
|
||||||
diff-lcs (>= 1.1.3, < 2.0)
|
diff-lcs (>= 1.1.3, < 2.0)
|
||||||
|
@ -88,8 +105,14 @@ GEM
|
||||||
rspec-expectations (~> 2.14.0)
|
rspec-expectations (~> 2.14.0)
|
||||||
rspec-mocks (~> 2.14.0)
|
rspec-mocks (~> 2.14.0)
|
||||||
sqlite3 (1.3.9)
|
sqlite3 (1.3.9)
|
||||||
|
test-unit (3.0.9)
|
||||||
|
power_assert
|
||||||
|
therubyrhino (2.0.4)
|
||||||
|
therubyrhino_jar (>= 1.7.3)
|
||||||
|
therubyrhino_jar (1.7.4)
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.3)
|
thread_safe (0.3.3)
|
||||||
|
thread_safe (0.3.3-java)
|
||||||
tzinfo (1.2.0)
|
tzinfo (1.2.0)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.5.0)
|
uglifier (2.5.0)
|
||||||
|
@ -97,16 +120,22 @@ GEM
|
||||||
json (>= 1.8.0)
|
json (>= 1.8.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
|
java
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
|
activerecord-jdbcsqlite3-adapter
|
||||||
appraisal
|
appraisal
|
||||||
aruba
|
aruba
|
||||||
coffee-rails
|
coffee-rails
|
||||||
cucumber (= 1.3.19)
|
cucumber (= 1.3.19)
|
||||||
factory_girl_rails!
|
factory_girl_rails!
|
||||||
|
jdbc-sqlite3
|
||||||
jquery-rails
|
jquery-rails
|
||||||
|
jruby-openssl
|
||||||
rake
|
rake
|
||||||
rspec-rails
|
rspec-rails
|
||||||
sqlite3
|
sqlite3
|
||||||
|
test-unit
|
||||||
|
therubyrhino
|
||||||
uglifier
|
uglifier
|
||||||
|
|
|
@ -5,13 +5,18 @@ source "https://rubygems.org"
|
||||||
gem "appraisal"
|
gem "appraisal"
|
||||||
gem "aruba"
|
gem "aruba"
|
||||||
gem "coffee-rails"
|
gem "coffee-rails"
|
||||||
gem "cucumber"
|
gem "cucumber", "1.3.19"
|
||||||
gem "jquery-rails"
|
gem "jquery-rails"
|
||||||
gem "rake"
|
gem "rake"
|
||||||
gem "rspec-rails"
|
gem "rspec-rails"
|
||||||
gem "uglifier"
|
gem "uglifier"
|
||||||
gem "sqlite3"
|
gem "test-unit"
|
||||||
gem "rails", "~> 3.2.18"
|
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
|
||||||
|
gem "jdbc-sqlite3", :platforms => :jruby
|
||||||
|
gem "therubyrhino", :platforms => :jruby
|
||||||
|
gem "jruby-openssl", :platforms => :jruby
|
||||||
|
gem "sqlite3", :platforms => :ruby
|
||||||
|
gem "rails", "~> 3.2.21"
|
||||||
gem "sass-rails"
|
gem "sass-rails"
|
||||||
|
|
||||||
gemspec :path => "../"
|
gemspec :path => "../"
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
# This file was generated by Appraisal
|
|
||||||
|
|
||||||
source "https://rubygems.org"
|
|
||||||
|
|
||||||
gem "appraisal"
|
|
||||||
gem "aruba"
|
|
||||||
gem "coffee-rails"
|
|
||||||
gem "cucumber"
|
|
||||||
gem "jquery-rails"
|
|
||||||
gem "rake"
|
|
||||||
gem "rspec-rails"
|
|
||||||
gem "uglifier"
|
|
||||||
gem "sqlite3"
|
|
||||||
gem "rails", "~> 4.0.5"
|
|
||||||
gem "sass-rails"
|
|
||||||
|
|
||||||
gemspec :path => "../"
|
|
|
@ -5,14 +5,19 @@ source "https://rubygems.org"
|
||||||
gem "appraisal"
|
gem "appraisal"
|
||||||
gem "aruba"
|
gem "aruba"
|
||||||
gem "coffee-rails"
|
gem "coffee-rails"
|
||||||
gem "cucumber"
|
gem "cucumber", "1.3.19"
|
||||||
gem "jquery-rails"
|
gem "jquery-rails"
|
||||||
gem "rake"
|
gem "rake"
|
||||||
gem "rspec-rails"
|
gem "rspec-rails"
|
||||||
gem "uglifier"
|
gem "uglifier"
|
||||||
gem "sqlite3"
|
gem "test-unit"
|
||||||
gem "rails", "~> 4.1.1"
|
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
|
||||||
gem "sass-rails", "~> 4.0.3"
|
gem "jdbc-sqlite3", :platforms => :jruby
|
||||||
|
gem "therubyrhino", :platforms => :jruby
|
||||||
|
gem "jruby-openssl", :platforms => :jruby
|
||||||
|
gem "sqlite3", :platforms => :ruby
|
||||||
|
gem "rails", "~> 4.1.9"
|
||||||
|
gem "sass-rails"
|
||||||
gem "spring"
|
gem "spring"
|
||||||
|
|
||||||
gemspec :path => "../"
|
gemspec :path => "../"
|
||||||
|
|
21
gemfiles/rails4.2.gemfile
Normal file
21
gemfiles/rails4.2.gemfile
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
# This file was generated by Appraisal
|
||||||
|
|
||||||
|
source "https://rubygems.org"
|
||||||
|
|
||||||
|
gem "appraisal"
|
||||||
|
gem "aruba"
|
||||||
|
gem "coffee-rails"
|
||||||
|
gem "cucumber", "1.3.19"
|
||||||
|
gem "jquery-rails"
|
||||||
|
gem "rake"
|
||||||
|
gem "rspec-rails"
|
||||||
|
gem "uglifier"
|
||||||
|
gem "test-unit"
|
||||||
|
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
|
||||||
|
gem "jdbc-sqlite3", :platforms => :jruby
|
||||||
|
gem "therubyrhino", :platforms => :jruby
|
||||||
|
gem "jruby-openssl", :platforms => :jruby
|
||||||
|
gem "sqlite3", :platforms => :ruby
|
||||||
|
gem "rails", "~> 4.2.0"
|
||||||
|
|
||||||
|
gemspec :path => "../"
|
Loading…
Reference in a new issue