rspec-rails 4.0.0.beta3 → 4.0.2

data/lib/rspec/rails/example/channel_example_group.rb

@@ -34,7 +34,7 @@ if RSpec::Rails::FeatureCheck.has_action_cable_testing?
               next if klass <= ::ActionCable::Channel::Base
 
               raise "Described class is not a channel class.\n" \
-                    "Specify the channel class in the `describe` statement "\
+                    "Specify the channel class in the `describe` statement " \
                     "or set it manually using `tests MyChannelClass`"
             end
           end
@@ -45,7 +45,7 @@ if RSpec::Rails::FeatureCheck.has_action_cable_testing?
               next if klass <= ::ActionCable::Connection::Base
 
               raise "Described class is not a connection class.\n" \
-                    "Specify the connection class in the `describe` statement "\
+                    "Specify the connection class in the `describe` statement " \
                     "or set it manually using `tests MyConnectionClass`"
             end
           end

data/lib/rspec/rails/example/controller_example_group.rb

@@ -94,9 +94,9 @@ module RSpec
             self.routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
               r.draw do
                 resources resource_name,
-                          :as => resource_as,
-                          :module => resource_module,
-                          :path => resource_path
+                          as: resource_as,
+                          module: resource_module,
+                          path: resource_path
               end
             end
           end
@@ -159,7 +159,7 @@ module RSpec
       #
       #         expect do
       #           bypass_rescue
-      #           get :show, :id => profile.id + 1
+      #           get :show, id: profile.id + 1
       #         end.to raise_error(/403 Forbidden/)
       #       end
       #     end

data/lib/rspec/rails/example/feature_example_group.rb

@@ -37,37 +37,17 @@ end
 
 unless RSpec.respond_to?(:feature)
   opts = {
-    :capybara_feature => true,
-    :type => :feature,
-    :skip => <<-EOT.squish
-      Feature specs require the Capybara (https://github.com/jnicklas/capybara)
-      gem, version 2.2.0 or later. We recommend version 2.4.0 or later to avoid
-      some deprecation warnings and have support for
-      `config.expose_dsl_globally = false`.
+    capybara_feature: true,
+    type: :feature,
+    skip: <<-EOT.squish
+      Feature specs require the Capybara (https://github.com/teamcapybara/capybara)
+      gem, version 2.13.0 or later.
     EOT
   }
 
-  # Capybara's monkey patching causes us to have to jump through some hoops
-  top_level = self
-  main_feature = nil
-  if defined?(Capybara) && ::Capybara::VERSION.to_f < 2.4
-    # Capybara 2.2 and 2.3 do not use `alias_example_xyz`
-    opts[:skip] = <<-EOT.squish
-      Capybara < 2.4.0 does not support RSpec's namespace or
-      `config.expose_dsl_globally = false`. Upgrade to Capybara >= 2.4.0.
-    EOT
-    main_feature = top_level.method(:feature) if top_level.respond_to?(:feature)
-  end
-
   RSpec.configure do |c|
-    main_feature = nil unless c.expose_dsl_globally?
     c.alias_example_group_to :feature, opts
     c.alias_example_to :scenario
-    c.alias_example_to :xscenario, :skip => 'Temporarily skipped with xscenario'
+    c.alias_example_to :xscenario, skip: 'Temporarily skipped with xscenario'
   end
-
-  # Due to load order issues and `config.expose_dsl_globally?` defaulting to
-  # `true` we need to put Capybara's monkey patch method back. Otherwise,
-  # app upgrades have a high likelyhood of having all feature specs skipped.
-  top_level.define_singleton_method(:feature, &main_feature) if main_feature
 end

data/lib/rspec/rails/example/helper_example_group.rb

@@ -12,16 +12,8 @@ module RSpec
 
       # @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
 

data/lib/rspec/rails/example/mailbox_example_group.rb

@@ -13,7 +13,7 @@ module RSpec
         def self.create_inbound_email(arg)
           case arg
           when Hash
-            create_inbound_email_from_mail(arg)
+            create_inbound_email_from_mail(**arg)
           else
             create_inbound_email_from_source(arg.to_s)
           end

data/lib/rspec/rails/example/mailer_example_group.rb

@@ -21,8 +21,8 @@ if defined?(ActionMailer)
 
         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.

data/lib/rspec/rails/example/rails_example_group.rb

@@ -9,7 +9,7 @@ module RSpec
     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

data/lib/rspec/rails/example/system_example_group.rb

@@ -50,6 +50,10 @@ module RSpec
       end
 
       included do |other|
+        ActiveSupport.on_load(:action_dispatch_system_test_case) do
+          ActionDispatch::SystemTesting::Server.silence_puma = true
+        end
+
         begin
           require 'capybara'
           require 'action_dispatch/system_test_case'
@@ -71,7 +75,6 @@ module RSpec
         original_after_teardown =
           ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown.instance_method(:after_teardown)
 
-        other.include ActionDispatch::IntegrationTest::Behavior
         other.include ::ActionDispatch::SystemTesting::TestHelpers::SetupAndTeardown
         other.include ::ActionDispatch::SystemTesting::TestHelpers::ScreenshotHelper
         other.include BlowAwayTeardownHooks
@@ -85,16 +88,19 @@ module RSpec
         def initialize(*args, &blk)
           super(*args, &blk)
           @driver = nil
+
+          self.class.before do
+            # A user may have already set the driver, so only default if driver
+            # is not set
+            driven_by(:selenium) unless @driver
+          end
         end
 
-        def driven_by(*args, &blk)
-          @driver = ::ActionDispatch::SystemTestCase.driven_by(*args, &blk).tap(&:use)
+        def driven_by(driver, **driver_options, &blk)
+          @driver = ::ActionDispatch::SystemTestCase.driven_by(driver, **driver_options, &blk).tap(&:use)
         end
 
         before do
-          # A user may have already set the driver, so only default if driver
-          # is not set
-          driven_by(:selenium) unless @driver
           @routes = ::Rails.application.routes
         end
 
@@ -108,7 +114,8 @@ module RSpec
             original_after_teardown.bind(self).call
           ensure
             myio = $stdout
-            RSpec.current_example.metadata[:extra_failure_lines] = myio.string
+            myio.rewind
+            RSpec.current_example.metadata[:extra_failure_lines] = myio.readlines
             $stdout = orig_stdout
           end
         end

data/lib/rspec/rails/example/view_example_group.rb

@@ -43,16 +43,13 @@ module RSpec
 
         included do
           include ::Rails.application.routes.url_helpers
-
-          if ::Rails.application.routes.respond_to?(:mounted_helpers)
-            include ::Rails.application.routes.mounted_helpers
-          end
+          include ::Rails.application.routes.mounted_helpers
         end
 
         # @overload render
-        # @overload render({:partial => path_to_file})
-        # @overload render({:partial => path_to_file}, {... locals ...})
-        # @overload render({:partial => path_to_file}, {... locals ...}) do ... end
+        # @overload render({partial: path_to_file})
+        # @overload render({partial: path_to_file}, {... locals ...})
+        # @overload render({partial: path_to_file}, {... locals ...}) do ... end
         #
         # Delegates to ActionView::Base#render, so see documentation on that
         # for more info.
@@ -62,7 +59,7 @@ module RSpec
         #
         #     describe "widgets/new.html.erb" do
         #       it "shows all the widgets" do
-        #         render # => view.render(:file => "widgets/new.html.erb")
+        #         render # => view.render(file: "widgets/new.html.erb")
         #         # ...
         #       end
         #     end
@@ -105,7 +102,7 @@ module RSpec
 
         # @deprecated Use `view` instead.
         def template
-          RSpec.deprecate("template", :replacement => "view")
+          RSpec.deprecate("template", replacement: "view")
           view
         end
 
@@ -128,41 +125,37 @@ module RSpec
       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
@@ -192,10 +185,7 @@ module RSpec
 
         before do
           _include_controller_helpers
-          if view.lookup_context.respond_to?(:prefixes)
-            # rails 3.1
-            view.lookup_context.prefixes << _controller_path
-          end
+          view.lookup_context.prefixes << _controller_path
 
           controller.controller_path = _controller_path
 

data/lib/rspec/rails/extensions/active_record/proxy.rb

@@ -1,16 +1,11 @@
 RSpec.configure do |rspec|
   # Delay this in order to give users a chance to configure `expect_with`...
   rspec.before(:suite) do
-    if defined?(RSpec::Matchers) && RSpec::Matchers.configuration.syntax.include?(:should) && defined?(ActiveRecord::Associations)
-      # In Rails 3.0, it was AssociationProxy.
-      # In 3.1+, it's CollectionProxy.
-      const_name = [:CollectionProxy, :AssociationProxy].find do |const|
-        ActiveRecord::Associations.const_defined?(const)
-      end
-
-      proxy_class = ActiveRecord::Associations.const_get(const_name)
-
-      RSpec::Matchers.configuration.add_should_and_should_not_to proxy_class
+    if defined?(RSpec::Matchers) &&
+        RSpec::Matchers.configuration.respond_to?(:syntax) && # RSpec 4 dropped support for monkey-patching `should` syntax
+        RSpec::Matchers.configuration.syntax.include?(:should) &&
+        defined?(ActiveRecord::Associations)
+      RSpec::Matchers.configuration.add_should_and_should_not_to ActiveRecord::Associations::CollectionProxy
     end
   end
 end

data/lib/rspec/rails/feature_check.rb

@@ -3,16 +3,6 @@ module RSpec
     # @private
     module FeatureCheck
       module_function
-      def can_check_pending_migrations?
-        has_active_record_migration? &&
-          ::ActiveRecord::Migration.respond_to?(:check_pending!)
-      end
-
-      def can_maintain_test_schema?
-        has_active_record_migration? &&
-          ::ActiveRecord::Migration.respond_to?(:maintain_test_schema!)
-      end
-
       def has_active_job?
         defined?(::ActiveJob)
       end
@@ -37,11 +27,6 @@ module RSpec
         defined?(::ActionCable) && ActionCable::VERSION::MAJOR >= 6
       end
 
-      def has_action_mailer_show_preview?
-        has_action_mailer_preview? &&
-          ::ActionMailer::Base.respond_to?(:show_previews=)
-      end
-
       def has_action_mailer_parameterized?
         has_action_mailer? && defined?(::ActionMailer::Parameterized)
       end
@@ -54,20 +39,8 @@ module RSpec
         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

data/lib/rspec/rails/fixture_file_upload_support.rb

@@ -2,13 +2,18 @@ module RSpec
   module Rails
     # @private
     module FixtureFileUploadSupport
-      delegate :fixture_file_upload, :to => :rails_fixture_file_wrapper
+      delegate :fixture_file_upload, to: :rails_fixture_file_wrapper
 
     private
 
       def rails_fixture_file_wrapper
         RailsFixtureFileWrapper.fixture_path = nil
-        resolved_fixture_path = (fixture_path || RSpec.configuration.fixture_path || '').to_s
+        resolved_fixture_path =
+          if respond_to?(:fixture_path) && !fixture_path.nil?
+            fixture_path.to_s
+          else
+            (RSpec.configuration.fixture_path || '').to_s
+          end
         RailsFixtureFileWrapper.fixture_path = File.join(resolved_fixture_path, '') unless resolved_fixture_path.strip.empty?
         RailsFixtureFileWrapper.instance
       end
@@ -17,22 +22,12 @@ module RSpec
         include ActionDispatch::TestProcess if defined?(ActionDispatch::TestProcess)
 
         class << self
-          attr_reader :fixture_path
+          attr_accessor :fixture_path
 
           # Get instance of wrapper
           def instance
             @instance ||= new
           end
-
-          # Override fixture_path set
-          # to support Rails 3.0->3.1 using ActionController::TestCase class to resolve fixture_path
-          # see https://apidock.com/rails/v3.0.0/ActionDispatch/TestProcess/fixture_file_upload
-          def fixture_path=(value)
-            if ActionController::TestCase.respond_to?(:fixture_path)
-              ActionController::TestCase.fixture_path = value
-            end
-            @fixture_path = value
-          end
         end
       end
     end

data/lib/rspec/rails/fixture_support.rb

@@ -5,52 +5,58 @@ module RSpec
       if defined?(ActiveRecord::TestFixtures)
         extend ActiveSupport::Concern
         include RSpec::Rails::SetupAndTeardownAdapter
-        include RSpec::Rails::MinitestLifecycleAdapter if ::ActiveRecord::VERSION::STRING > '4'
+        include RSpec::Rails::MinitestLifecycleAdapter
         include RSpec::Rails::MinitestAssertionAdapter
         include ActiveRecord::TestFixtures
 
         included do
-          # TODO: (DC 2011-06-25) this is necessary because fixture_file_upload
-          # accesses fixture_path directly on ActiveSupport::TestCase. This is
-          # fixed in rails by https://github.com/rails/rails/pull/1861, which
-          # should be part of the 3.1 release, at which point we can include
-          # these lines for rails < 3.1.
-          ActiveSupport::TestCase.class_exec do
-            include ActiveRecord::TestFixtures
+          if RSpec.configuration.use_active_record?
+            include Fixtures
+
             self.fixture_path = RSpec.configuration.fixture_path
-          end
-          # /TODO
+            if ::Rails::VERSION::STRING > '5'
+              self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
+            else
+              self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+            end
+            self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures
 
-          self.fixture_path = RSpec.configuration.fixture_path
-          if ::Rails::VERSION::STRING > '5'
-            self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
-          else
-            self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+            fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
           end
-          self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures
+        end
 
-          def self.fixtures(*args)
-            orig_methods = private_instance_methods
-            super.tap do
-              new_methods = private_instance_methods - orig_methods
-              new_methods.each do |method_name|
-                proxy_method_warning_if_called_in_before_context_scope(method_name)
+        module Fixtures
+          extend ActiveSupport::Concern
+
+          class_methods do
+            def fixtures(*args)
+              orig_methods = private_instance_methods
+              super.tap do
+                new_methods = private_instance_methods - orig_methods
+                new_methods.each do |method_name|
+                  proxy_method_warning_if_called_in_before_context_scope(method_name)
+                end
               end
             end
-          end
 
-          def self.proxy_method_warning_if_called_in_before_context_scope(method_name)
-            orig_implementation = instance_method(method_name)
-            define_method(method_name) do |*args, &blk|
-              if inspect.include?("before(:context)")
-                RSpec.warn_with("Calling fixture method in before :context ")
-              else
-                orig_implementation.bind(self).call(*args, &blk)
+            def proxy_method_warning_if_called_in_before_context_scope(method_name)
+              orig_implementation = instance_method(method_name)
+              define_method(method_name) do |*args, &blk|
+                if inspect.include?("before(:context)")
+                  RSpec.warn_with("Calling fixture method in before :context ")
+                else
+                  orig_implementation.bind(self).call(*args, &blk)
+                end
               end
             end
           end
 
-          fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
+          if ::Rails.version.to_f >= 6.1
+            # @private return the example name for TestFixtures
+            def name
+              @example
+            end
+          end
         end
       end
     end