Merge pull request #2614 from rspec/remove-some-hacks

Remove version-specific checks for unsupported Rails/Ruby

Author: JonRowe

Gemfile

@@ -12,22 +12,12 @@ group :documentation do
   gem 'relish', '~> 0.7.1'
 end
 
-gem 'rake', '> 12'
-
-if RUBY_VERSION.to_f >= 2.3
-  gem 'rubocop', '~> 0.80.1'
-end
-
 gem 'capybara'
-
-if RUBY_VERSION.to_f >= 2.3
-  gem 'ffi', '~> 1.15.5'
-else
-  gem 'ffi', '~> 1.12.0'
-end
+gem 'ffi', '~> 1.15.5'
+gem 'rake', '> 12'
+gem 'rubocop', '~> 0.80.1'
 
 custom_gemfile = File.expand_path('Gemfile-custom', __dir__)
 eval_gemfile custom_gemfile if File.exist?(custom_gemfile)
 
-eval_gemfile 'Gemfile-sqlite-dependencies'
 eval_gemfile 'Gemfile-rails-dependencies'

Gemfile-rails-dependencies

@@ -11,6 +11,9 @@ def add_net_gems_dependency
   end
 end
 
+# sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
+gem 'sqlite3', '~> 1.4', platforms: [:ruby]
+
 case version = ENV['RAILS_VERSION'] || (File.exist?(version_file) && File.read(version_file).chomp) || ''
 when /main/
   gem "rails", :git => "https://github.com/rails/rails.git"

Gemfile-sqlite-dependencies

@@ -34,6 +34,6 @@ Rails than you are trying to use now.
 To run the specs against a different version of Rails, use the `thor` command:
 
 ```bash
-bin/thor version:use 6.0.2.2
+bin/thor version:use 7.0.3.1
 bin/rake
 ```

README_DEV.md

@@ -1,3 +1,3 @@
-default: --require features --format progress --tags 'not @wip'
-pretty:  --require features --format pretty   --tags 'not @wip'
-wip:     --require features --tags @wip
+default: --publish-quiet --require features --format progress --tags 'not @wip'
+pretty:  --publish-quiet --require features --format pretty   --tags 'not @wip'
+wip:     --publish-quiet --require features --tags @wip

cucumber.yml

@@ -15,12 +15,7 @@
     end
   CODE
 
-  rails_parent =
-    if Rails.version.to_f >= 6.0
-      Rails.application.class.module_parent.to_s
-    else
-      Rails.application.class.parent.to_s
-    end
+  rails_parent = Rails.application.class.module_parent.to_s
 
   gsub_file 'config/initializers/action_mailer.rb', /ExampleApp/, rails_parent
 

example_app_generator/config/initializers/sqlite3_fix.rb

@@ -11,7 +11,6 @@
   'ci_retry_bundle_install.sh'
 )
 function_script_file = File.join(rspec_rails_repo_path, 'script/functions.sh')
-sqlite_initializer = File.join(rspec_rails_repo_path, "example_app_generator/config/initializers/sqlite3_fix.rb")
 
 in_root do
   prepend_to_file "Rakefile", "require 'active_support/all'"
@@ -27,31 +26,12 @@
 
   append_to_file 'Gemfile', "gem 'rails-controller-testing'\n"
 
-  if Rails::VERSION::STRING >= '6'
-    gsub_file "Gemfile", /.*rails-controller-testing.*/, "gem 'rails-controller-testing', git: 'https://github.com/rails/rails-controller-testing'"
+  gsub_file "Gemfile", /.*rails-controller-testing.*/, "gem 'rails-controller-testing', git: 'https://github.com/rails/rails-controller-testing'"
 
-    # TODO: To remove when Rails released with https://github.com/rails/rails/pull/40281
-    append_to_file 'Gemfile', <<-EOT.gsub(/^ +\|/, '')
-      |gem 'rexml'
-    EOT
-  end
-
-  if Rails::VERSION::STRING >= '6'
-    # sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
-    gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4'"
-  else
-    # Similarly, Rails 5.0 only supports '~> 1.3.6'. Rails 5.1-5.2 support '~> 1.3', '>= 1.3.6'
-    gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.3.6'"
-  end
+  # sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
+  gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4'"
 
-  # webdrivers 4 up until 4.3.0 don't specify `required_ruby_version`, but contain
-  # Ruby 2.2-incompatible syntax (safe navigation).
-  # That basically means we use pre-4.0 for Ruby 2.2, and 4.3+ for newer Rubies.
-  gsub_file "Gemfile", /.*chromedriver-helper.*/, "gem 'webdrivers', '!= 4.0.0', '!= 4.0.1', '!= 4.1.0', '!= 4.1.1', '!= 4.1.2', '!= 4.1.3', '!= 4.2.0'"
-
-  if Rails::VERSION::STRING < '6'
-    copy_file sqlite_initializer, 'config/initializers/sqlite3_fix.rb'
-  end
+  gsub_file "Gemfile", /.*chromedriver-helper.*/, "gem 'webdrivers'"
 
   if RUBY_ENGINE == "jruby"
     gsub_file "Gemfile", /.*jdbc.*/, ''

example_app_generator/generate_action_mailer_specs.rb

@@ -26,11 +26,9 @@ require_file_stub 'config/environment' do
     require "action_controller/railtie"
     require "action_mailer/railtie" unless ENV['NO_ACTION_MAILER']
     require "action_view/railtie"
-    if Rails::VERSION::STRING >= '6'
-      require "action_cable/engine"
-      require "active_job/railtie"
-      require "action_mailbox/engine"
-    end
+    require "action_cable/engine"
+    require "active_job/railtie"
+    require "action_mailbox/engine"
 
     # Require the gems listed in Gemfile, including any gems
     # you've limited to :test, :development, or :production.

example_app_generator/generate_app.rb

@@ -36,12 +36,6 @@ def index
 
         expect(response).to render_template(:bar)
       end
-
-      it "renders an empty string", skip: Rails::VERSION::STRING.to_f >= 6.0 do
-        get :index
-
-        expect(response.body).to eq("")
-      end
     end
 
     context "with a custom renderer prepended to the view path" do