Merge pull request #2190 from rspec/remove-older-rails

JonRowe · web-flow · commit be3ae66f2586 · 2019-10-19T17:19:35.000+01:00
Remove older rails support
diff --git a/Gemfile-rails-dependencies b/Gemfile-rails-dependencies
@@ -5,7 +5,6 @@ when /master/
   gem "arel", :git => "https://github.com/rails/arel.git"
   gem "journey", :git => "https://github.com/rails/journey.git"
   gem "activerecord-deprecated_finders", :git => "https://github.com/rails/activerecord-deprecated_finders.git"
-  gem "rails-observers", :git => "https://github.com/rails/rails-observers"
   gem "web-console", :git => "https://github.com/rails/web-console", :group => :development
   gem 'coffee-rails', :git => "https://github.com/rails/coffee-rails.git"
   gem 'rack', :git => 'https://github.com/rack/rack.git'
diff --git a/example_app_generator/generate_action_mailer_specs.rb b/example_app_generator/generate_action_mailer_specs.rb
@@ -15,21 +15,10 @@ def comment_lines(path, flag, *args)
   initializer 'action_mailer.rb', <<-CODE
   require "action_view/base"
     if ENV['DEFAULT_URL']
-      if ::Rails::VERSION::STRING < '4.1'
-        ExampleApp::Application.configure do
-          config.action_mailer.default_url_options = { :host => ENV['DEFAULT_URL'] }
-        end
-      else
-        Rails.application.configure do
-          config.action_mailer.default_url_options = { :host => ENV['DEFAULT_URL'] }
-        end
+      ExampleApp::Application.configure do
+        config.action_mailer.default_url_options = { :host => ENV['DEFAULT_URL'] }
       end
     end
-
-    if defined?(ActionMailer) && Rails::VERSION::MAJOR < 4
-      # This will force the loading of ActionMailer settings
-      ActionMailer::Base.smtp_settings
-    end
   CODE
   gsub_file 'config/initializers/action_mailer.rb',
             /ExampleApp/,
diff --git a/example_app_generator/generate_stuff.rb b/example_app_generator/generate_stuff.rb
@@ -19,9 +19,6 @@ def final_tasks
       copy_file 'spec/verify_custom_renderers_spec.rb'
       copy_file 'spec/verify_fixture_warning_spec.rb'
       run('bin/rake db:migrate')
-      if ::Rails::VERSION::STRING.to_f < 4.1
-        run('bin/rake db:migrate RAILS_ENV=test')
-      end
     end
 
     def skip_active_record?
@@ -93,7 +90,6 @@ def using_source_path(path)
 generate('model thing name:string')
 generate('helper things')
 generate('scaffold widget name:string category:string instock:boolean foo_id:integer bar_id:integer --force')
-generate('observer widget') if ::Rails::VERSION::STRING.to_f < 4.0
 generate('scaffold gadget') # scaffold with no attributes
 generate('scaffold ticket original_price:float discounted_price:float')
 generate('scaffold admin/account name:string') # scaffold with nested resource
diff --git a/example_app_generator/spec/support/default_preview_path b/example_app_generator/spec/support/default_preview_path
@@ -29,16 +29,11 @@ require_file_stub 'config/environment' do
 
     # Require the gems listed in Gemfile, including any gems
     # you've limited to :test, :development, or :production.
-    if Rails::VERSION::STRING.to_f < 3.1
-      Bundler.require(:default, Rails.env)
-    else
-      Bundler.require(*Rails.groups)
-    end
+    Bundler.require(*Rails.groups)
 
     module ExampleApp
       class Application < Rails::Application
         config.eager_load = false
-        config.eager_load_paths.clear if Rails::VERSION::MAJOR < 4
 
         # Don't care if the mailer can't send.
         config.action_mailer.raise_delivery_errors = false unless ENV['NO_ACTION_MAILER']
diff --git a/features/matchers/relation_match_array.feature b/features/matchers/relation_match_array.feature
@@ -12,11 +12,7 @@ Feature: ActiveRecord::Relation match array
       RSpec.describe Widget do
         let!(:widgets) { Array.new(3) { Widget.create } }
 
-        if ::Rails::VERSION::STRING >= '4'
-          subject { Widget.all }
-        else
-          subject { Widget.scoped }
-        end
+        subject { Widget.all }
 
         it "returns all widgets in any order" do
           expect(subject).to match_array(widgets)
diff --git a/lib/generators/rspec.rb b/lib/generators/rspec.rb
@@ -18,12 +18,6 @@ def self.source_root(path = nil)
           @_rspec_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'rspec', generator_name, 'templates'))
         end
       end
-
-      if ::Rails::VERSION::STRING < '3.1'
-        def module_namespacing
-          yield if block_given?
-        end
-      end
     end
   end
 end
diff --git a/lib/generators/rspec/observer/observer_generator.rb b/lib/generators/rspec/observer/observer_generator.rb
diff --git a/lib/generators/rspec/observer/templates/observer_spec.rb b/lib/generators/rspec/observer/templates/observer_spec.rb
diff --git a/lib/generators/rspec/scaffold/templates/routing_spec.rb b/lib/generators/rspec/scaffold/templates/routing_spec.rb
@@ -34,12 +34,10 @@
       expect(:put => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", :id => "1")
     end
 
-<% if Rails::VERSION::STRING > '4' -%>
     it "routes to #update via PATCH" do
       expect(:patch => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", :id => "1")
     end
 
-<% end -%>
     it "routes to #destroy" do
       expect(:delete => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#destroy", :id => "1")
     end
diff --git a/lib/rspec-rails.rb b/lib/rspec-rails.rb
@@ -47,9 +47,7 @@ def setup_preview_path(app)
       def config_preview_path?(options)
         # We cannot use `respond_to?(:show_previews)` here as it will always
         # return `true`.
-        if ::Rails::VERSION::STRING < '4.2'
-          ::Rails.env.development?
-        elsif options.show_previews.nil?
+        if options.show_previews.nil?
           options.show_previews = ::Rails.env.development?
         else
           options.show_previews
@@ -74,7 +72,7 @@ def supports_action_mailer_previews?(config)
         # not respond to the method. However, we cannot use
         # `config.action_mailer.respond_to?(:preview_path)` here as it will
         # always return `true`.
-        config.respond_to?(:action_mailer) && ::Rails::VERSION::STRING > '4.1'
+        config.respond_to?(:action_mailer)
       end
     end
   end
diff --git a/lib/rspec/rails/adapters.rb b/lib/rspec/rails/adapters.rb
@@ -19,68 +19,15 @@ def self.disable_testunit_autorun
     end
     private_class_method :disable_testunit_autorun
 
-    if ::Rails::VERSION::STRING >= '4.1.0'
-      if defined?(Kernel.gem)
-        gem 'minitest'
-      else
-        require 'minitest'
-      end
-      require 'minitest/assertions'
-      # Constant aliased to either Minitest or TestUnit, depending on what is
-      # loaded.
-      Assertions = Minitest::Assertions
-    elsif RUBY_VERSION >= '2.2.0'
-      # Minitest / TestUnit has been removed from ruby core. However, we are
-      # on an old Rails version and must load the appropriate gem
-      if ::Rails::VERSION::STRING >= '4.0.0'
-        # ActiveSupport 4.0.x has the minitest '~> 4.2' gem as a dependency
-        # This gem has no `lib/minitest.rb` file.
-        gem 'minitest' if defined?(Kernel.gem)
-        require 'minitest/unit'
-        Assertions = MiniTest::Assertions
-      elsif ::Rails::VERSION::STRING >= '3.2.21'
-        # TODO: Change the above check to >= '3.2.22' once it's released
-        begin
-          # Test::Unit "helpfully" sets up autoload for its `AutoRunner`.
-          # While we do not reference it directly, when we load the `TestCase`
-          # classes from AS (ActiveSupport), AS kindly references `AutoRunner`
-          # for everyone.
-          #
-          # To handle this we need to pre-emptively load 'test/unit' and make
-          # sure the version installed has `AutoRunner` (the 3.x line does to
-          # date). If so, we turn the auto runner off.
-          require 'test/unit'
-          require 'test/unit/assertions'
-          disable_testunit_autorun
-        rescue LoadError => e
-          raise LoadError, <<-ERR.squish, e.backtrace
-            Ruby 2.2+ has removed test/unit from the core library. Rails
-            requires this as a dependency. Please add test-unit gem to your
-            Gemfile: `gem 'test-unit', '~> 3.0'` (#{e.message})"
-          ERR
-        end
-        Assertions = Test::Unit::Assertions
-      else
-        abort <<-MSG.squish
-          Ruby 2.2+ is not supported on Rails #{::Rails::VERSION::STRING}.
-          Check the Rails release notes for the appropriate update with
-          support.
-        MSG
-      end
+    if defined?(Kernel.gem)
+      gem 'minitest'
     else
-      begin
-        require 'test/unit/assertions'
-      rescue LoadError
-        # work around for Rubinius not having a std std-lib
-        require 'rubysl-test-unit' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-        require 'test/unit/assertions'
-      end
-      # Turn off test unit's auto runner for those using the gem
-      disable_testunit_autorun
-      # Constant aliased to either Minitest or TestUnit, depending on what is
-      # loaded.
-      Assertions = Test::Unit::Assertions
+      require 'minitest'
     end
+    require 'minitest/assertions'
+    # Constant aliased to either Minitest or TestUnit, depending on what is
+    # loaded.
+    Assertions = Minitest::Assertions
 
     # @private
     class AssertionDelegator < Module
@@ -217,14 +164,8 @@ def define_assertion_delegators
 
         # Starting on Rails 4, Minitest is the default testing framework so no
         # need to add TestUnit specific methods.
-        if ::Rails::VERSION::STRING >= '4.0.0'
-          def test_unit_specific_methods
-            []
-          end
-        else
-          def test_unit_specific_methods
-            [:build_message]
-          end
+        def test_unit_specific_methods
+          []
         end
       end
 
diff --git a/lib/rspec/rails/example/helper_example_group.rb b/lib/rspec/rails/example/helper_example_group.rb
@@ -12,16 +12,8 @@ module HelperExampleGroup
 
       # @private
       module ClassMethods
-        if ::Rails::VERSION::MAJOR > 3
-          def determine_constant_from_test_name(_ignore)
-            described_class if yield(described_class)
-          end
-        else
-          def determine_default_helper_class(_ignore)
-            return unless Module === described_class && !(Class === described_class)
-
-            described_class
-          end
+        def determine_constant_from_test_name(_ignore)
+          described_class if yield(described_class)
         end
       end
 
diff --git a/lib/rspec/rails/example/rails_example_group.rb b/lib/rspec/rails/example/rails_example_group.rb
@@ -9,7 +9,7 @@ module Rails
     module RailsExampleGroup
       extend ActiveSupport::Concern
       include RSpec::Rails::SetupAndTeardownAdapter
-      include RSpec::Rails::MinitestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
+      include RSpec::Rails::MinitestLifecycleAdapter
       include RSpec::Rails::MinitestAssertionAdapter
       include RSpec::Rails::FixtureSupport
     end
diff --git a/lib/rspec/rails/example/view_example_group.rb b/lib/rspec/rails/example/view_example_group.rb
@@ -128,41 +128,37 @@ def rendered.body
       private
 
         def _default_render_options
-          if ::Rails::VERSION::STRING >= '3.2'
-            formats = if ActionView::Template::Types.respond_to?(:symbols)
-                        ActionView::Template::Types.symbols
-                      else
-                        [:html, :text, :js, :css, :xml, :json].map(&:to_s)
-                      end.map { |x| Regexp.escape(x) }.join("|")
-
-            handlers = ActionView::Template::Handlers.extensions.map { |x| Regexp.escape(x) }.join("|")
-            locales = "[a-z]{2}(?:-[A-Z]{2})?"
-            variants = "[^.]*"
-            path_regex = %r{
-            \A
-            (?<template>.*?)
-            (?:\.(?<locale>#{locales}))??
-              (?:\.(?<format>#{formats}))??
-              (?:\+(?<variant>#{variants}))??
-              (?:\.(?<handler>#{handlers}))?
-              \z
-            }x
-
-            # This regex should always find a match.
-            # Worst case, everything will be nil, and :template will just be
-            # the original string.
-            match = path_regex.match(_default_file_to_render)
-
-            render_options = { :template => match[:template] }
-            render_options[:handlers] = [match[:handler]] if match[:handler]
-            render_options[:formats] = [match[:format].to_sym] if match[:format]
-            render_options[:locales] = [match[:locale]] if match[:locale]
-            render_options[:variants] = [match[:variant]] if match[:variant]
-
-            render_options
-          else
-            { :template => _default_file_to_render }
-          end
+          formats = if ActionView::Template::Types.respond_to?(:symbols)
+                      ActionView::Template::Types.symbols
+                    else
+                      [:html, :text, :js, :css, :xml, :json].map(&:to_s)
+                    end.map { |x| Regexp.escape(x) }.join("|")
+
+          handlers = ActionView::Template::Handlers.extensions.map { |x| Regexp.escape(x) }.join("|")
+          locales = "[a-z]{2}(?:-[A-Z]{2})?"
+          variants = "[^.]*"
+          path_regex = %r{
+          \A
+          (?<template>.*?)
+          (?:\.(?<locale>#{locales}))??
+            (?:\.(?<format>#{formats}))??
+            (?:\+(?<variant>#{variants}))??
+            (?:\.(?<handler>#{handlers}))?
+            \z
+          }x
+
+          # This regex should always find a match.
+          # Worst case, everything will be nil, and :template will just be
+          # the original string.
+          match = path_regex.match(_default_file_to_render)
+
+          render_options = { :template => match[:template] }
+          render_options[:handlers] = [match[:handler]] if match[:handler]
+          render_options[:formats] = [match[:format].to_sym] if match[:format]
+          render_options[:locales] = [match[:locale]] if match[:locale]
+          render_options[:variants] = [match[:variant]] if match[:variant]
+
+          render_options
         end
 
         def _path_parts
diff --git a/lib/rspec/rails/feature_check.rb b/lib/rspec/rails/feature_check.rb
@@ -54,20 +54,12 @@ def has_action_mailbox?
         defined?(::ActionMailbox)
       end
 
-      def has_1_9_hash_syntax?
-        ::Rails::VERSION::STRING > '4.0'
-      end
-
       def has_file_fixture?
         ::Rails::VERSION::STRING > '5.0'
       end
 
       def type_metatag(type)
-        if has_1_9_hash_syntax?
-          "type: :#{type}"
-        else
-          ":type => :#{type}"
-        end
+        "type: :#{type}"
       end
     end
   end
diff --git a/spec/generators/rspec/observer/observer_generator_spec.rb b/spec/generators/rspec/observer/observer_generator_spec.rb
diff --git a/spec/rspec/rails/assertion_adapter_spec.rb b/spec/rspec/rails/assertion_adapter_spec.rb
diff --git a/spec/rspec/rails/example/view_example_group_spec.rb b/spec/rspec/rails/example/view_example_group_spec.rb
diff --git a/spec/rspec/rails/matchers/relation_match_array_spec.rb b/spec/rspec/rails/matchers/relation_match_array_spec.rb
