Add back Ruby 2.2 support for Rails 5

rspec · May 12, 2020 · 5227212 · 5227212
1 parent 5c3d3d5
commit 5227212
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -75,6 +75,8 @@ matrix:
       env: RAILS_VERSION='~> 5.2.0'
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 5.2.0'
+    - rvm: 2.2.10
+      env: RAILS_VERSION='~> 5.2.0'
 
     # Rails 5.1 Builds >= 2.2.2
     - rvm: 2.6.6
@@ -85,6 +87,8 @@ matrix:
       env: RAILS_VERSION='~> 5.1.0'
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 5.1.0'
+    - rvm: 2.2.10
+      env: RAILS_VERSION='~> 5.1.0'
 
     # Rails 5.0 Builds >= 2.2.2
     - rvm: 2.6.6
@@ -95,5 +99,7 @@ matrix:
       env: RAILS_VERSION='~> 5.0.0'
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 5.0.0'
+    - rvm: 2.2.10
+      env: RAILS_VERSION='~> 5.0.0'
 
   fast_finish: true
diff --git a/Gemfile b/Gemfile
@@ -46,7 +46,11 @@ gem 'rake', '~> 12'
 
 gem 'mime-types', "~> 3"
 
-gem 'capybara', '>= 2.13', '< 4.0', require: false
+if RUBY_VERSION == '2.2.0'
+  gem 'capybara', '~> 3.1.0'
+else
+  gem 'capybara', '>= 2.13', '< 4.0', require: false
+end
 
 if MAJOR < 6
   gem 'nokogiri', '1.9.1'
@@ -56,7 +60,9 @@ end
 
 gem "rubyzip", '~> 1.2'
 
-gem 'rubocop', '~> 0.80.1'
+if RUBY_VERSION.to_f >= 2.3
+  gem 'rubocop', '~> 0.80.1'
+end
 
 custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
 eval_gemfile custom_gemfile if File.exist?(custom_gemfile)

diff --git a/lib/rspec/rails/example/mailer_example_group.rb b/lib/rspec/rails/example/mailer_example_group.rb
@@ -21,8 +21,8 @@ module MailerExampleGroup
 
         included do
           include ::Rails.application.routes.url_helpers
-          options = ::Rails.configuration.action_mailer.default_url_options
-          options&.each { |key, value| default_url_options[key] = value }
+          options = ::Rails.configuration.action_mailer.default_url_options || {}
+          options.each { |key, value| default_url_options[key] = value }
         end
 
         # Class-level DSL for mailer specs.

diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
@@ -5,5 +5,11 @@
 set -e
 source script/functions.sh
 
-gem update --no-document --system
-gem install --no-document bundler
+if is_ruby_23_plus; then
+  gem update --no-document --system
+  gem install --no-document bundler
+else
+  echo "Warning installing older versions of Rubygems / Bundler"
+  gem update --system '2.7.8'
+  gem install bundler -v '1.17.3'
+fi