Update test versions and dependencies (thoughtbot#1269)

Fatsoma · Jan 1, 2020 · d97bdd6 · d97bdd6
1 parent 94b5b2a
commit d97bdd6
Show file tree

Hide file tree

Showing 17 changed files with 607 additions and 679 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,24 +7,25 @@ env:
     - DATABASE_ADAPTER=sqlite3
     - DATABASE_ADAPTER=postgresql
 rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.3
+  - 2.6.5
+  - 2.5.7
+  - 2.4.9
 gemfile:
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_6_0.gemfile
+  - gemfiles/rails_5_2.gemfile
+  - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_4_2.gemfile
 matrix:
   exclude:
-    - rvm: 2.4.6
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.6.5
       gemfile: gemfiles/rails_4_2.gemfile
+    - rvm: 2.4.9
+      gemfile: gemfiles/rails_6_0.gemfile
 cache: bundler
 # Source: <https://docs.travis-ci.com/user/languages/ruby/#bundler-20>
 before_install:
+  - nvm install 12
   - gem update --system '2.7.8' --no-document
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
   - gem install bundler -v '< 2' --no-document

diff --git a/Appraisals b/Appraisals
@@ -3,16 +3,9 @@
 # best to keep the gems here in the same order as they're listed there so you
 # can compare them more easily.
 
-shared_jruby_dependencies = proc do
-  gem 'activerecord-jdbc-adapter', platform: :jruby
-  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-  gem 'jdbc-sqlite3', platform: :jruby
-  gem 'jruby-openssl', platform: :jruby
-  gem 'therubyrhino', platform: :jruby
-end
-
-shared_rails_dependencies = proc do
-  gem 'sqlite3', '~> 1.3.6', platform: :ruby
+# Needed for Rails 5+ controller tests
+controller_test_dependency = proc do
+  gem 'rails-controller-testing', '>= 1.0.1'
 end
 
 shared_spring_dependencies = proc do
@@ -21,21 +14,19 @@ shared_spring_dependencies = proc do
 end
 
 shared_test_dependencies = proc do
-  gem 'rspec-rails', '~> 3.6'
+  gem 'rspec-rails', '~> 3.9'
   gem 'shoulda-context', '~> 1.2.0'
 end
 
 shared_dependencies = proc do
-  instance_eval(&shared_jruby_dependencies)
-  instance_eval(&shared_rails_dependencies)
   instance_eval(&shared_spring_dependencies)
   instance_eval(&shared_test_dependencies)
 end
 
 appraise 'rails_4_2' do
   instance_eval(&shared_dependencies)
 
-  gem 'rails', '~> 4.2.11.1'
+  gem 'rails', '4.2.11.1'
   gem 'sass-rails', '~> 5.0'
   gem 'uglifier', '>= 1.3.0'
   gem 'coffee-rails', '~> 4.1.0'
@@ -49,14 +40,17 @@ appraise 'rails_4_2' do
   gem 'activeresource', '4.0.0'
   gem 'json', '~> 1.4'
   gem 'protected_attributes', '~> 1.0.6'
-  gem 'pg', '~> 0.15', platform: :ruby
+
+  # Database adapters
+  gem 'pg', '~> 0.18'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise 'rails_5_0' do
   instance_eval(&shared_dependencies)
+  instance_eval(&controller_test_dependency)
 
-  gem 'rails', '~> 5.0.7.2'
-  gem 'rails-controller-testing', '>= 1.0.1'
+  gem 'rails', '5.0.7.2'
   gem 'puma', '~> 3.0'
   gem 'sass-rails', '~> 5.0'
   gem 'jquery-rails'
@@ -66,15 +60,16 @@ appraise 'rails_5_0' do
   gem 'listen', '~> 3.0.5'
   gem 'spring-watcher-listen', '~> 2.0.0'
 
-  # Other dependencies
-  gem 'pg', '~> 1.1', platform: :ruby
+  # Database adapters
+  gem 'pg', '~> 0.18'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise 'rails_5_1' do
   instance_eval(&shared_dependencies)
+  instance_eval(&controller_test_dependency)
 
-  gem 'rails', '~> 5.1.6.2'
-  gem 'rails-controller-testing', '>= 1.0.1'
+  gem 'rails', '5.1.7'
   gem 'puma', '~> 3.7'
   gem 'sass-rails', '~> 5.0'
   gem 'turbolinks', '~> 5'
@@ -85,15 +80,16 @@ appraise 'rails_5_1' do
   gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'spring-watcher-listen', '~> 2.0.0'
 
-  # Other dependencies
-  gem 'pg', '~> 1.1', platform: :ruby
+  # Database adapters
+  gem 'pg', '~> 0.18'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 appraise 'rails_5_2' do
   instance_eval(&shared_dependencies)
+  instance_eval(&controller_test_dependency)
 
-  gem 'rails', '~> 5.2.2.1'
-  gem 'rails-controller-testing', '>= 1.0.1'
+  gem 'rails', '5.2.4.1'
   gem 'puma', '~> 3.11'
   gem 'bootsnap', '>= 1.1.0', require: false
   gem 'sass-rails', '~> 5.0'
@@ -106,30 +102,32 @@ appraise 'rails_5_2' do
   gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'spring-watcher-listen', '~> 2.0.0'
 
-  # Other dependencies
-  gem 'pg', '~> 1.1', platform: :ruby
+  # Database adapters
+  gem 'pg', '~> 0.18'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 if Gem::Requirement.new('>= 2.5.0').satisfied_by?(Gem::Version.new(RUBY_VERSION))
   appraise 'rails_6_0' do
     instance_eval(&shared_dependencies)
+    instance_eval(&controller_test_dependency)
 
-    gem 'rails', '~> 6.0.0.beta3'
-    gem 'puma', '~> 3.11'
-    gem 'bootsnap', '>= 1.4.1', require: false
-    gem 'sass-rails', '~> 5.0'
-    gem 'webpacker', '>= 4.0.0.rc3'
+    gem 'rails', '6.0.2.1'
+    gem 'puma', '~> 4.1'
+    gem 'bootsnap', '>= 1.4.2', require: false
+    gem 'sass-rails', '>= 6'
+    gem 'webpacker', '~> 4.0'
     gem 'turbolinks', '~> 5'
-    gem 'jbuilder', '~> 2.5'
+    gem 'jbuilder', '~> 2.7'
     gem 'bcrypt', '~> 3.1.7'
     gem 'capybara', '>= 2.15'
     gem 'listen', '>= 3.0.5', '< 3.2'
     gem 'spring-watcher-listen', '~> 2.0.0'
     gem 'selenium-webdriver'
-    gem 'chromedriver-helper'
+    gem 'webdrivers'
 
-    # Other dependencies
-    gem 'rails-controller-testing', '>= 1.0.1'
-    gem 'pg', '~> 1.1', platform: :ruby
+    # Database adapters
+    gem 'pg', '>= 0.18', '< 2.0'
+    gem 'sqlite3', '~> 1.4'
   end
 end
diff --git a/gemfiles/rails_4_2.gemfile b/gemfiles/rails_4_2.gemfile
@@ -6,26 +6,20 @@ gem "appraisal", "2.2.0"
 gem "bundler", "~> 1.1"
 gem "pry"
 gem "pry-byebug"
-gem "rake", "12.3.2"
-gem "rspec", "~> 3.6"
+gem "rake", "13.0.1"
+gem "rspec", "~> 3.9"
 gem "rubocop", require: false
 gem "rubocop-rails", require: false
 gem "zeus", require: false
 gem "fssm"
 gem "pygments.rb"
 gem "redcarpet"
 gem "yard"
-gem "activerecord-jdbc-adapter", platform: :jruby
-gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-gem "jdbc-sqlite3", platform: :jruby
-gem "jruby-openssl", platform: :jruby
-gem "therubyrhino", platform: :jruby
-gem "sqlite3", "~> 1.3.6", platform: :ruby
 gem "spring"
 gem "spring-commands-rspec"
-gem "rspec-rails", "~> 3.6"
+gem "rspec-rails", "~> 3.9"
 gem "shoulda-context", "~> 1.2.0"
-gem "rails", "~> 4.2.11.1"
+gem "rails", "4.2.11.1"
 gem "sass-rails", "~> 5.0"
 gem "uglifier", ">= 1.3.0"
 gem "coffee-rails", "~> 4.1.0"
@@ -37,4 +31,5 @@ gem "bcrypt", "~> 3.1.7"
 gem "activeresource", "4.0.0"
 gem "json", "~> 1.4"
 gem "protected_attributes", "~> 1.0.6"
-gem "pg", "~> 0.15", platform: :ruby
+gem "pg", "~> 0.18"
+gem "sqlite3", "~> 1.3.6"