rspec-rails 7.1.0 → 8.0.0

data/README.md

@@ -9,6 +9,7 @@ detailed explanations of how the application is supposed to behave,
 expressed in plain English.
 
 According to [RSpec Rails new versioning strategy][] use:
+* **[`rspec-rails` 8.x][]** for Rails 8.0 or 7.2.
 * **[`rspec-rails` 7.x][]** for Rails 7.x.
 * **[`rspec-rails` 6.x][]** for Rails 6.1, 7.0 or 7.1.
 * **[`rspec-rails` 5.x][]** for Rails 5.2 or 6.x.
@@ -27,14 +28,15 @@ According to [RSpec Rails new versioning strategy][] use:
 [`rspec-rails` 4.x]: https://github.com/rspec/rspec-rails/tree/4-1-maintenance
 [`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-1-maintenance
 [`rspec-rails` 6.x]: https://github.com/rspec/rspec-rails/tree/6-1-maintenance
-[`rspec-rails` 7.x]: https://github.com/rspec/rspec-rails/tree/7-0-maintenance
+[`rspec-rails` 7.x]: https://github.com/rspec/rspec-rails/tree/7-1-maintenance
+[`rspec-rails` 8.x]: https://github.com/rspec/rspec-rails/tree/8-0-maintenance
 [RSpec Rails new versioning strategy]: https://github.com/rspec/rspec-rails/blob/main/rfcs/versioning-strategy.md
 
 ## Installation
 
-**IMPORTANT** This README / branch refers to the 7.1.x stable release series, only bugfixes from this series will
+**IMPORTANT** This README / branch refers to the 8.0.x stable release series, only bugfixes from this series will
 be added here. See the [`main` branch on Github](https://github.com/rspec/rspec-rails/tree/main) if you want or
-require the latest unstable features.
+require the latest unstable features.https://github.com/rspec/rspec-rails/tree/8-0-maintenance) if you want or require the latest stable release.
 
 1. Add `rspec-rails` to **both** the `:development` and `:test` groups
    of your app’s `Gemfile`:
@@ -42,15 +44,12 @@ require the latest unstable features.
    ```ruby
    # Run against this stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 7.0.0'
+     gem 'rspec-rails', '~> 8.0.0'
    end
 
    # Or, run against the main branch
-   # (requires main-branch versions of all related RSpec libraries)
    group :development, :test do
-     %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
-       gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'main'
-     end
+     gem 'rspec-rails', git: 'https://github.com/rspec/rspec-rails'
    end
    ```
 
@@ -89,7 +88,7 @@ read the [`rspec-rails` upgrade notes][] to find out what to watch out for.
 
 Be sure to check the general [RSpec upgrade notes][] as well.
 
-[`rspec-rails` upgrade notes]: https://rspec.info/features/7-0/rspec-rails/upgrade
+[`rspec-rails` upgrade notes]: https://rspec.info/features/8-0/rspec-rails/upgrade
 [RSpec upgrade notes]: https://rspec.info/upgrading-from-rspec-2/
 
 ## Usage
@@ -211,22 +210,22 @@ to test the various parts of a Rails system:
 Follow the links above for examples of how each matcher is used.
 
 [the matchers that come standard in RSpec]: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers
-[`be_a_new`]: https://rspec.info/features/7-0/rspec-rails/matchers/new-record-matcher
-[`render_template`]: https://rspec.info/features/7-0/rspec-rails/matchers/render-template-matcher
-[`redirect_to`]: https://rspec.info/features/7-0/rspec-rails/matchers/redirect-to-matcher
-[`route_to`]: https://rspec.info/features/7-0/rspec-rails/routing-specs/route-to-matcher
-[`be_routable`]: https://rspec.info/features/7-0/rspec-rails/routing-specs/be-routable-matcher
-[`have_http_status`]: https://rspec.info/features/7-0/rspec-rails/matchers/have-http-status-matcher
-[`match_array`]: https://rspec.info/features/7-0/rspec-rails/matchers/relation-match-array
-[`have_been_enqueued`]: https://rspec.info/features/7-0/rspec-rails/matchers/have-been-enqueued-matcher
-[`have_enqueued_job`]: https://rspec.info/features/7-0/rspec-rails/matchers/have-enqueued-job-matcher
+[`be_a_new`]: https://rspec.info/features/8-0/rspec-rails/matchers/new-record-matcher
+[`render_template`]: https://rspec.info/features/8-0/rspec-rails/matchers/render-template-matcher
+[`redirect_to`]: https://rspec.info/features/8-0/rspec-rails/matchers/redirect-to-matcher
+[`route_to`]: https://rspec.info/features/8-0/rspec-rails/routing-specs/route-to-matcher
+[`be_routable`]: https://rspec.info/features/8-0/rspec-rails/routing-specs/be-routable-matcher
+[`have_http_status`]: https://rspec.info/features/8-0/rspec-rails/matchers/have-http-status-matcher
+[`match_array`]: https://rspec.info/features/8-0/rspec-rails/matchers/relation-match-array
+[`have_been_enqueued`]: https://rspec.info/features/8-0/rspec-rails/matchers/have-been-enqueued-matcher
+[`have_enqueued_job`]: https://rspec.info/features/8-0/rspec-rails/matchers/have-enqueued-job-matcher
 
 ### What else does RSpec Rails add?
 
 For a comprehensive look at RSpec Rails’ features,
 read the [official Cucumber documentation][].
 
-[official Cucumber documentation]: https://rspec.info/features/7-0/rspec-rails
+[official Cucumber documentation]: https://rspec.info/features/8-0/rspec-rails
 
 ## What tests should I write?
 
@@ -271,20 +270,20 @@ RSpec.describe User, type: :model do
 ...
 ```
 
-[request]: https://rspec.info/features/7-0/rspec-rails/request-specs/request-spec
-[feature]: https://rspec.info/features/7-0/rspec-rails/feature-specs/feature-spec
-[system]: https://rspec.info/features/7-0/rspec-rails/system-specs/system-specs
-[model]: https://rspec.info/features/7-0/rspec-rails/model-specs
-[controller]: https://rspec.info/features/7-0/rspec-rails/controller-specs
-[mailer]: https://rspec.info/features/7-0/rspec-rails/mailer-specs
-[job]: https://rspec.info/features/7-0/rspec-rails/job-specs/job-spec
-[view]: https://rspec.info/features/7-0/rspec-rails/view-specs/view-spec
-[routing]: https://rspec.info/features/7-0/rspec-rails/routing-specs
-[helper]: https://rspec.info/features/7-0/rspec-rails/helper-specs/helper-spec
+[request]: https://rspec.info/features/8-0/rspec-rails/request-specs/request-spec
+[feature]: https://rspec.info/features/8-0/rspec-rails/feature-specs/feature-spec
+[system]: https://rspec.info/features/8-0/rspec-rails/system-specs/system-specs
+[model]: https://rspec.info/features/8-0/rspec-rails/model-specs
+[controller]: https://rspec.info/features/8-0/rspec-rails/controller-specs
+[mailer]: https://rspec.info/features/8-0/rspec-rails/mailer-specs
+[job]: https://rspec.info/features/8-0/rspec-rails/job-specs/job-spec
+[view]: https://rspec.info/features/8-0/rspec-rails/view-specs/view-spec
+[routing]: https://rspec.info/features/8-0/rspec-rails/routing-specs
+[helper]: https://rspec.info/features/8-0/rspec-rails/helper-specs/helper-spec
 [`ActionDispatch::IntegrationTest`]: https://api.rubyonrails.org/classes/ActionDispatch/IntegrationTest.html
 [`ActionDispatch::SystemTestCase`]: https://api.rubyonrails.org/classes/ActionDispatch/SystemTestCase.html
 [`ActionController::TestCase`]: https://api.rubyonrails.org/classes/ActionController/TestCase.html
-[in the appropriate folder]: https://rspec.info/features/7-0/rspec-rails/directory-structure
+[in the appropriate folder]: https://rspec.info/features/8-0/rspec-rails/directory-structure
 
 ### System specs, feature specs, request specs–what’s the difference?
 
@@ -368,9 +367,6 @@ you can run the specs and Cucumber features, or submit a pull request.
 ### RSpec base libraries
 
 * https://github.com/rspec/rspec
-* https://github.com/rspec/rspec-core
-* https://github.com/rspec/rspec-expectations
-* https://github.com/rspec/rspec-mocks
 
 ### Recommended third-party extensions
 

data/lib/generators/rspec/authentication/authentication_generator.rb

@@ -0,0 +1,25 @@
+require 'generators/rspec'
+
+module Rspec
+  module Generators
+    # @private
+    class AuthenticationGenerator < Base
+      def initialize(args, *options)
+        args.replace(['User'])
+        super
+      end
+
+      def create_user_spec
+        template 'user_spec.rb', target_path('models', 'user_spec.rb')
+      end
+
+      hook_for :fixture_replacement
+
+      def create_fixture_file
+        return if options[:fixture_replacement]
+
+        template 'users.yml', target_path('fixtures', 'users.yml')
+      end
+    end
+  end
+end

data/lib/generators/rspec/authentication/templates/user_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe User, <%= type_metatag(:model) %> do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

data/lib/generators/rspec/authentication/templates/users.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+<%% password_digest = BCrypt::Password.create("password") %>
+
+one:
+  email_address: one@example.com
+  password_digest: <%%= password_digest %>
+
+two:
+  email_address: two@example.com
+  password_digest: <%%= password_digest %>

data/lib/generators/rspec/install/templates/spec/rails_helper.rb

@@ -28,7 +28,9 @@ require 'rspec/rails'
 # Rails.root.glob('spec/support/**/*.rb').sort_by(&:to_s).each { |f| require f }
 
 <% if RSpec::Rails::FeatureCheck.has_active_record_migration? -%>
-# Checks for pending migrations and applies them before tests are run.
+# Ensures that the test database schema matches the current schema file.
+# If there are pending migrations it will invoke `db:test:prepare` to
+# recreate the test database by loading the schema.
 # If you are not using ActiveRecord, you can remove these lines.
 begin
   ActiveRecord::Migration.maintain_test_schema!
@@ -39,13 +41,9 @@ end
 RSpec.configure do |config|
 <% if RSpec::Rails::FeatureCheck.has_active_record? -%>
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-<% if ::Rails::VERSION::STRING < "7.1.0" -%>
-  config.fixture_path = Rails.root.join('spec/fixtures')
-<% else -%>
   config.fixture_paths = [
     Rails.root.join('spec/fixtures')
   ]
-<% end -%>
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -63,7 +61,9 @@ RSpec.configure do |config|
   # note if you'd prefer not to run each example within a transaction, you
   # should set use_transactional_fixtures to false.
   #
-  # config.fixture_path = Rails.root.join('spec/fixtures')
+  # config.fixture_paths = [
+  #   Rails.root.join('spec/fixtures')
+  # ]
   # config.use_transactional_fixtures = true
 
 <% end -%>
@@ -75,7 +75,7 @@ RSpec.configure do |config|
   #     end
   #
   # The different available types are documented in the features, such as in
-  # https://rspec.info/features/7-0/rspec-rails
+  # https://rspec.info/features/8-0/rspec-rails
   #
   # You can also this infer these behaviours automatically by location, e.g.
   # /spec/models would pull in the same behaviour as `type: :model` but this

data/lib/rspec/rails/configuration.rb

@@ -1,4 +1,3 @@
-# rubocop: disable Metrics/ModuleLength
 module RSpec
   module Rails
     # Fake class to document RSpec Rails configuration options. In practice,
@@ -57,7 +56,7 @@ module RSpec
     end
 
     # @private
-    def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/PerceivedComplexity
+    def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
       config.backtrace_exclusion_patterns << /vendor\//
       config.backtrace_exclusion_patterns << %r{lib/rspec/rails}
 
@@ -69,12 +68,7 @@ module RSpec
       config.add_setting :use_transactional_fixtures, alias_with: :use_transactional_examples
       config.add_setting :use_instantiated_fixtures
       config.add_setting :global_fixtures
-
-      if ::Rails::VERSION::STRING < "7.1.0"
-        config.add_setting :fixture_path
-      else
-        config.add_setting :fixture_paths
-      end
+      config.add_setting :fixture_paths
 
       config.include RSpec::Rails::FixtureSupport, :use_fixtures
 
@@ -90,7 +84,7 @@ module RSpec
       config.add_setting :file_fixture_path, default: 'spec/fixtures/files'
       config.include RSpec::Rails::FileFixtureSupport
 
-      # Add support for fixture_path on fixture_file_upload
+      # Add support for fixture_paths on fixture_file_upload
       config.include RSpec::Rails::FixtureFileUploadSupport
 
       # This allows us to expose `render_views` as a config option even though it
@@ -114,40 +108,6 @@ module RSpec
           rendering_views?
         end
 
-        undef :rendering_views? if respond_to?(:rendering_views?)
-        def rendering_views?
-          !!rendering_views
-        end
-
-        # Define boolean predicates rather than relying on rspec-core due
-        # to the bug fix in rspec/rspec-core#2736, note some of these
-        # predicates are a bit nonsensical, but they exist for backwards
-        # compatibility, we can tidy these up in `rspec-rails` 5.
-        undef :fixture_path? if respond_to?(:fixture_path?)
-        def fixture_path?
-          !!fixture_path
-        end
-
-        undef :global_fixtures? if respond_to?(:global_fixtures?)
-        def global_fixtures?
-          !!global_fixtures
-        end
-
-        undef :infer_base_class_for_anonymous_controllers? if respond_to?(:infer_base_class_for_anonymous_controllers?)
-        def infer_base_class_for_anonymous_controllers?
-          !!infer_base_class_for_anonymous_controllers
-        end
-
-        undef :use_instantiated_fixtures? if respond_to?(:use_instantiated_fixtures?)
-        def use_instantiated_fixtures?
-          !!use_instantiated_fixtures
-        end
-
-        undef :use_transactional_fixtures? if respond_to?(:use_transactional_fixtures?)
-        def use_transactional_fixtures?
-          !!use_transactional_fixtures
-        end
-
         def infer_spec_type_from_file_location!
           DIRECTORY_MAPPINGS.each do |type, dir_parts|
             escaped_path = Regexp.compile(dir_parts.join('[\\\/]') + '[\\\/]')
@@ -163,29 +123,6 @@ module RSpec
           filter_gems_from_backtrace "activemodel", "activerecord",
                                      "activesupport", "activejob"
         end
-
-        # @deprecated TestFixtures#fixture_path is deprecated and will be removed in Rails 7.2
-        if ::Rails::VERSION::STRING >= "7.1.0"
-          def fixture_path
-            RSpec.deprecate(
-              "config.fixture_path",
-              replacement: "config.fixture_paths",
-              message: "Rails 7.1 has deprecated the singular fixture_path in favour of an array." \
-              "You should migrate to plural:"
-            )
-            fixture_paths&.first
-          end
-
-          def fixture_path=(path)
-            RSpec.deprecate(
-              "config.fixture_path = #{path.inspect}",
-              replacement: "config.fixture_paths = [#{path.inspect}]",
-              message: "Rails 7.1 has deprecated the singular fixture_path in favour of an array." \
-              "You should migrate to plural:"
-            )
-            self.fixture_paths = Array(path)
-          end
-        end
       end
 
       add_test_type_configurations(config)
@@ -219,4 +156,3 @@ module RSpec
     initialize_configuration RSpec.configuration
   end
 end
-# rubocop: enable Metrics/ModuleLength

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

@@ -44,64 +44,57 @@ module RSpec
         ].join("_").tr(CHARS_TO_TRANSLATE.join, "_").byteslice(0...200).scrub("") + "_#{rand(1000)}"
       end
 
-      if ::Rails::VERSION::STRING.to_f >= 7.1
-        # @private
-        # Allows failure screenshot to work whilst not exposing metadata
-        class SuppressRailsScreenshotMetadata
-          def initialize
-            @example_data = {}
-          end
-
-          def [](key)
-            if @example_data.key?(key)
-              @example_data[key]
-            else
-              raise_wrong_scope_error
-            end
-          end
+      # @private
+      # Allows failure screenshot to work whilst not exposing metadata
+      class SuppressRailsScreenshotMetadata
+        def initialize
+          @example_data = {}
+        end
 
-          def []=(key, value)
-            if key == :failure_screenshot_path
-              @example_data[key] = value
-            else
-              raise_wrong_scope_error
-            end
+        def [](key)
+          if @example_data.key?(key)
+            @example_data[key]
+          else
+            raise_wrong_scope_error
           end
+        end
 
-          def method_missing(_name, *_args, &_block)
+        def []=(key, value)
+          if key == :failure_screenshot_path
+            @example_data[key] = value
+          else
             raise_wrong_scope_error
           end
+        end
 
-          private
-
-          def raise_wrong_scope_error
-            raise RSpec::Core::ExampleGroup::WrongScopeError,
-                  "`metadata` is not available from within an example " \
-                  "(e.g. an `it` block) or from constructs that run in the " \
-                  "scope of an example (e.g. `before`, `let`, etc). It is " \
-                  "only available on an example group (e.g. a `describe` or "\
-                  "`context` block)"
-          end
+        def method_missing(_name, *_args, &_block)
+          raise_wrong_scope_error
         end
 
-        # @private
-        def metadata
-          @metadata ||= SuppressRailsScreenshotMetadata.new
+        private
+
+        def raise_wrong_scope_error
+          raise RSpec::Core::ExampleGroup::WrongScopeError,
+                "`metadata` is not available from within an example " \
+                "(e.g. an `it` block) or from constructs that run in the " \
+                "scope of an example (e.g. `before`, `let`, etc). It is " \
+                "only available on an example group (e.g. a `describe` or "\
+                "`context` block)"
         end
       end
 
+      # @private
+      def metadata
+        @metadata ||= SuppressRailsScreenshotMetadata.new
+      end
+
       # Delegates to `Rails.application`.
       def app
         ::Rails.application
       end
 
       # Default driver to assign if none specified.
-      DEFAULT_DRIVER =
-        if ::Rails::VERSION::STRING.to_f >= 7.2
-          :selenium_chrome_headless
-        else
-          :selenium
-        end
+      DEFAULT_DRIVER = :selenium_chrome_headless
 
       included do |other|
         ActiveSupport.on_load(:action_dispatch_system_test_case) do
@@ -153,6 +146,10 @@ module RSpec
           @driver = ::ActionDispatch::SystemTestCase.driven_by(driver, **driver_options, &blk).tap(&:use)
         end
 
+        def served_by(**options)
+          ::ActionDispatch::SystemTestCase.served_by(**options)
+        end
+
         before do
           @routes = ::Rails.application.routes
         end

data/lib/rspec/rails/fixture_file_upload_support.rb

@@ -14,10 +14,8 @@ module RSpec
         resolved_fixture_path =
           if respond_to?(:file_fixture_path) && !file_fixture_path.nil?
             file_fixture_path.to_s
-          elsif respond_to?(:fixture_paths)
-            (RSpec.configuration.fixture_paths&.first || '').to_s
           else
-            (RSpec.configuration.fixture_path || '').to_s
+            (RSpec.configuration.fixture_paths&.first || '').to_s
           end
         RailsFixtureFileWrapper.file_fixture_path = File.join(resolved_fixture_path, '') unless resolved_fixture_path.strip.empty?
         RailsFixtureFileWrapper.instance
@@ -28,11 +26,7 @@ module RSpec
         include ActiveSupport::Testing::FileFixtures
 
         class << self
-          if ::Rails::VERSION::STRING < "7.1.0"
-            attr_accessor :fixture_path
-          else
-            attr_accessor :fixture_paths
-          end
+          attr_accessor :fixture_paths
 
           # Get instance of wrapper
           def instance

data/lib/rspec/rails/fixture_support.rb

@@ -20,12 +20,7 @@ module RSpec
           if RSpec.configuration.use_active_record?
             include Fixtures
 
-            # TestFixtures#fixture_path is deprecated and will be removed in Rails 7.2
-            if respond_to?(:fixture_paths=)
-              self.fixture_paths = RSpec.configuration.fixture_paths
-            else
-              self.fixture_path = RSpec.configuration.fixture_path
-            end
+            self.fixture_paths = RSpec.configuration.fixture_paths
 
             self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
             self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures
@@ -37,50 +32,25 @@ module RSpec
         module Fixtures
           extend ActiveSupport::Concern
 
-          # rubocop:disable Metrics/BlockLength
           class_methods do
-            if ::Rails.version.to_f >= 7.1
-              def fixtures(*args)
-                super.tap do
-                  fixture_sets.each_pair do |method_name, fixture_name|
-                    proxy_method_warning_if_called_in_before_context_scope(method_name, fixture_name)
-                  end
-                end
-              end
-
-              def proxy_method_warning_if_called_in_before_context_scope(method_name, fixture_name)
-                define_method(method_name) do |*args, **kwargs, &blk|
-                  if RSpec.current_scope == :before_context_hook
-                    RSpec.warn_with("Calling fixture method in before :context ")
-                  else
-                    access_fixture(fixture_name, *args, **kwargs, &blk)
-                  end
-                end
-              end
-            else
-              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
+            def fixtures(*args)
+              super.tap do
+                fixture_sets.each_pair do |method_name, fixture_name|
+                  proxy_method_warning_if_called_in_before_context_scope(method_name, fixture_name)
                 end
               end
+            end
 
-              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 RSpec.current_scope == :before_context_hook
-                    RSpec.warn_with("Calling fixture method in before :context ")
-                  else
-                    orig_implementation.bind(self).call(*args, &blk)
-                  end
+            def proxy_method_warning_if_called_in_before_context_scope(method_name, fixture_name)
+              define_method(method_name) do |*args, **kwargs, &blk|
+                if RSpec.current_scope == :before_context_hook
+                  RSpec.warn_with("Calling fixture method in before :context ")
+                else
+                  access_fixture(fixture_name, *args, **kwargs, &blk)
                 end
               end
             end
           end
-          # rubocop:enable Metrics/BlockLength
         end
       end
     end

data/lib/rspec/rails/matchers/active_job.rb

@@ -192,6 +192,8 @@ module RSpec
           end
 
           def skip_signature_verification?
+            return true unless defined?(::RSpec::Mocks) && (::RSpec::Mocks.respond_to?(:configuration))
+
             !RSpec::Mocks.configuration.verify_partial_doubles? ||
               RSpec::Mocks.configuration.temporarily_suppress_partial_double_verification
           end

data/lib/rspec/rails/matchers/have_enqueued_mail.rb

@@ -129,13 +129,13 @@ module RSpec
         end
 
         def unmatching_mail_jobs_message
-          msg = "Queued deliveries:"
+          messages = ["Queued deliveries:"]
 
           unmatching_mail_jobs.each do |job|
-            msg << "\n  #{mail_job_message(job)}"
+            messages << "  #{mail_job_message(job)}"
           end
 
-          msg
+          messages.join("\n")
         end
 
         def mail_job_message(job)

data/lib/rspec/rails/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Rails.
     module Version
       # Current version of RSpec Rails, in semantic versioning format.
-      STRING = '7.1.0'
+      STRING = '8.0.0'
     end
   end
 end

data/lib/rspec-rails.rb

@@ -64,18 +64,10 @@ module RSpec
         end
       end
 
-      if ::Rails::VERSION::STRING >= "7.1.0"
-        def config_default_preview_path(options)
-          return unless options.preview_paths.empty?
+      def config_default_preview_path(options)
+        return unless options.preview_paths.empty?
 
-          options.preview_paths << "#{::Rails.root}/spec/mailers/previews"
-        end
-      else
-        def config_default_preview_path(options)
-          return unless options.preview_path.blank?
-
-          options.preview_path = "#{::Rails.root}/spec/mailers/previews"
-        end
+        options.preview_paths << "#{::Rails.root}/spec/mailers/previews"
       end
 
       def supports_action_mailer_previews?(config)