Skip to content

Commit

Permalink
Update Appraisals
Browse files Browse the repository at this point in the history 
Get rid of the deprecated appraisal rake tasks in favor of running
appraisal directly. To run the whole suite, we can run
`bundle exec appraisal rake`.

I also went ahead and updated all the gemfiles.
  • Loading branch information
@composerinteralia
composerinteralia committed Oct 31, 2018
1 parent 8f3076d commit ba7f5ef
Show file tree
Hide file tree
Showing 6 changed files with 74 additions and 83 deletions.
83 changes: 41 additions & 42 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
actionview (5.2.1)
activesupport (= 5.2.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activerecord-jdbc-adapter (51.1-java)
activerecord (~> 5.1.0)
activerecord-jdbcsqlite3-adapter (51.1-java)
activerecord-jdbc-adapter (= 51.1)
activemodel (5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
arel (>= 9.0)
activerecord-jdbc-adapter (52.1-java)
activerecord (~> 5.2.0)
activerecord-jdbcsqlite3-adapter (52.1-java)
activerecord-jdbc-adapter (= 52.1)
jdbc-sqlite3 (~> 3.8, < 3.30)
activesupport (5.1.6)
activesupport (5.2.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand All @@ -41,7 +41,7 @@ GEM
bundler
rake
thor (>= 0.14.0)
arel (8.0.0)
arel (9.0.0)
aruba (0.14.6)
childprocess (>= 0.6.3, < 0.10.0)
contracts (~> 0.9)
Expand All @@ -60,8 +60,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
concurrent-ruby (1.0.5-java)
concurrent-ruby (1.1.0)
contracts (0.16.0)
crass (1.0.4)
cucumber (1.3.19)
Expand All @@ -81,27 +80,27 @@ GEM
multi_json (~> 1.3)
gherkin (2.12.2-java)
multi_json (~> 1.3)
i18n (1.0.1)
i18n (1.1.1)
concurrent-ruby (~> 1.0)
jdbc-sqlite3 (3.20.1)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jruby-openssl (0.10.1-java)
loofah (2.2.2)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
method_source (0.9.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
multi_test (0.1.2)
nokogiri (1.8.4)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogiri (1.8.4-java)
nokogiri (1.8.5-java)
parallel (1.12.1)
parser (2.5.1.2)
parser (2.5.3.0)
ast (~> 2.4.0)
power_assert (1.1.3)
powerpack (0.1.2)
Expand All @@ -113,31 +112,31 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.1)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-mocks (3.7.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.7.0)
rspec-rails (3.7.2)
rspec-support (~> 3.8.0)
rspec-rails (3.8.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-support (~> 3.7.0)
rspec-support (3.7.1)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rubocop (0.54.0)
parallel (~> 1.10)
parser (>= 2.5)
Expand All @@ -157,7 +156,7 @@ GEM
thread_safe (0.3.6-java)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.16)
uglifier (4.1.19)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.4.0)

Expand All @@ -184,4 +183,4 @@ DEPENDENCIES
uglifier

BUNDLED WITH
1.16.3
1.16.6
14 changes: 1 addition & 13 deletions Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,5 @@ end

RSpec::Core::RakeTask.new(:spec)

require "appraisal"

desc "Run the test suite"
task :default do
if ENV["BUNDLE_GEMFILE"] =~ /gemfiles/
exec "rake spec && rake cucumber"
else
Rake::Task["appraise"].execute
end
end

task appraise: ["appraisal:install"] do
exec "rake appraisal"
end
task default: %w(spec cucumber)
15 changes: 8 additions & 7 deletions gemfiles/rails4.2.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ 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 "uglifier"
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
gem "jdbc-sqlite3", platforms: :jruby
gem "jruby-openssl", platforms: :jruby
gem "therubyrhino", platforms: :jruby
gem "sqlite3", platforms: :ruby
gem "rubocop", "0.54", require: false
gem "rails", "~> 4.2.0"

gemspec :name => "factory_bot_rails", :path => "../"
gemspec name: "factory_bot_rails", path: "../"
15 changes: 8 additions & 7 deletions gemfiles/rails5.0.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ 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 "uglifier"
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
gem "jdbc-sqlite3", platforms: :jruby
gem "jruby-openssl", platforms: :jruby
gem "therubyrhino", platforms: :jruby
gem "sqlite3", platforms: :ruby
gem "rubocop", "0.54", require: false
gem "activerecord", "~> 5.0.0"
gem "railties", "~> 5.0.0"

gemspec :name => "factory_bot_rails", :path => "../"
gemspec name: "factory_bot_rails", path: "../"
15 changes: 8 additions & 7 deletions gemfiles/rails5.1.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ 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 "uglifier"
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
gem "jdbc-sqlite3", platforms: :jruby
gem "jruby-openssl", platforms: :jruby
gem "therubyrhino", platforms: :jruby
gem "sqlite3", platforms: :ruby
gem "rubocop", "0.54", require: false
gem "activerecord", "~> 5.1.0"
gem "railties", "~> 5.1.0"

gemspec :name => "factory_bot_rails", :path => "../"
gemspec name: "factory_bot_rails", path: "../"
15 changes: 8 additions & 7 deletions gemfiles/rails5.2.gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ 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 "uglifier"
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
gem "jdbc-sqlite3", platforms: :jruby
gem "jruby-openssl", platforms: :jruby
gem "therubyrhino", platforms: :jruby
gem "sqlite3", platforms: :ruby
gem "rubocop", "0.54", require: false
gem "activerecord", "~> 5.2.0"
gem "railties", "~> 5.2.0"

gemspec :name => "factory_bot_rails", :path => "../"
gemspec name: "factory_bot_rails", path: "../"

0 comments on commit ba7f5ef

Please sign in to comment.