diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 151369173a..251ecc5064 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -47,7 +47,7 @@ Please provide a description of what you expect to be happening, and how that
 differs from the current behaviour.
 -->
 
-## Can you provide an example app?
+## Can you provide an example reproduction?
 
 <!--
 This step is probably the most important in allowing us to quickly debug
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 1d5caa13fa..7e37aaf9d6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -3,7 +3,6 @@ name: Feature request
 about: Suggest an idea for this project
 title: ''
 labels: ''
-assignees: ''
 
 ---
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 119575574f..0a572b8605 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,21 +36,21 @@ jobs:
       fail-fast: false
       matrix:
        include:
-         # Edge Rails (?) builds >= 2.7
-         - ruby: 3.2
+         # Edge Rails (?) builds >= 3.1
+         - ruby: 3.3
            env:
              RAILS_VERSION: 'main'
-         - ruby: 3.1
-           env:
-             RAILS_VERSION: 'main'
-         - ruby: '3.0'
+         - ruby: 3.2
            env:
              RAILS_VERSION: 'main'
-         - ruby: 2.7
+         - ruby: 3.1
            env:
              RAILS_VERSION: 'main'
 
          # Rails 7.1 builds >= 2.7
+         - ruby: 3.3
+           env:
+             RAILS_VERSION: '~> 7.1.0'
          - ruby: 3.2
            env:
              RAILS_VERSION: '~> 7.1.0'
diff --git a/.github/workflows/depsreview.yaml b/.github/workflows/depsreview.yaml
index b9945082d5..b9d6d20fff 100644
--- a/.github/workflows/depsreview.yaml
+++ b/.github/workflows/depsreview.yaml
@@ -11,4 +11,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
diff --git a/.rubocop.yml b/.rubocop.yml
index bffff33031..a8347721b3 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -29,7 +29,7 @@ Bundler/DuplicatedGem:
 
 Gemspec/RequiredRubyVersion:
   # Rubocop checks that the target ruby version matches the gemspec version
-  # but doesnt have a 2.2 option
+  # but doesn't have a 2.2 option
   Enabled: false
 
 Metrics/BlockLength:
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
index 63294b1de3..ba0e6c290e 100644
--- a/.rubocop_rspec_base.yml
+++ b/.rubocop_rspec_base.yml
@@ -104,7 +104,7 @@ Style/SignalException:
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: no_space
 
-# We don't care about single vs double qoutes.
+# We don't care about single vs double quotes.
 Style/StringLiterals:
   Enabled: false
 
diff --git a/BUILD_DETAIL.md b/BUILD_DETAIL.md
index 50014d9bca..a6356b51c3 100644
--- a/BUILD_DETAIL.md
+++ b/BUILD_DETAIL.md
@@ -6,14 +6,14 @@ DO NOT modify it by hand as your changes will get lost the next time it is gener
 # The CI build, in detail
 
 The CI build runs many verification steps to prevent regressions and
-ensure high-quality code. To run the Travis build locally, run:
+ensure high-quality code. To run the build locally, run:
 
 ```
 $ script/run_build
 ```
 
 It can be useful to run the build steps individually
-to repro a failing part of a Travis build. Let's break
+to repro a failing part of a build. Let's break
 the build down into the individual steps.
 
 ## Specs
diff --git a/Changelog.md b/Changelog.md
index 49062ae6f1..3070130c1d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,8 +1,56 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.4...main)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.5...6-1-maintenance)
+
+### 6.1.5 / 2024-09-02
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.4...v6.1.5)
+
+Bug Fixes:
+
+* Restore old order of requiring support files. (Franz Liedke, #2785)
+* Prevent running `rake spec:statsetup` on Rails main / 8.0.0. (Petrik de Heus, #2781)
+
+### 6.1.4 / 2024-08-15
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.3...v6.1.4)
+
+Bug Fixes:
+
+* Prevent `have_http_status` matcher raising an error when encountering a raw `Rack::MockResponse`.
+  (Christophe Bliard, #2771)
+* Move Rails version conditional from index scaffold generated file to template. (Matt Jankowski, #2777)
+
+### 6.1.3 / 2024-06-19
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.2...v6.1.3)
+
+Bug Fixes:
+
+* Reset `ActiveSupport::CurrentAttributes` between examples. (Javier Julio, #2752)
+* Fix a broken link in generated mailer previews. (Chiara Núñez, #2764)
+* Fix `have_status_code` behaviour with deprecated status names by delegating
+  to `Rack::Utils.status_code/1` to set the expected status code. (Darren Boyd, #2765)
+
+### 6.1.2 / 2024-03-19
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.1...v6.1.2)
+
+Bug Fixes:
+
+* Fix generated mailer paths to match Rails convention. (Patrício dos Santos, #2735)
+* Fix class in template for generator specs. (Nicolas Buduroi, #2744)
+
+### 6.1.1 / 2024-01-25
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.0...v6.1.1)
+
+Bug Fixes:
+
+* Improved deprecation message for `RSpec::Rails::Configuration.fixture_paths`
+  (Benoit Tigeot, #2720)
+* Fix support for namespaced fixtures in Rails 7.1. (Benedikt Deicke, #2716)
+
+### 6.1.0 / 2023-11-21
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.4...v6.1.0)
 
 Enhancements:
 
+* Support for Rails 7.1
 * Minor tweak to generated `rails_helper.rb` to use `Rails.root.join`.
   (@masato-bkn, Ryo Nakamura, #2640, #2678)
 * Add `RSpec::Rails::Configuration.fixture_paths` configuration to support
@@ -168,7 +216,7 @@ Enhancements:
   (Eloy Espinaco, Luka Lüdicke, #2355, #2356, #2378)
 * Generated scaffold now includes engine route helpers when inside a mountable engine.
   (Andrew W. Lee, #2372)
-* Improve request spec "controller" scafold when no action is specified.
+* Improve request spec "controller" scaffold when no action is specified.
   (Thomas Hareau, #2399)
 * Introduce testing snippets concept (Phil Pirozhkov, Benoit Tigeot, #2423)
 * Prevent collisions with `let(:name)` for Rails 6.1 and `let(:method_name)` on older
@@ -571,7 +619,7 @@ Enhancements:
 * Add support for PATCH to route specs created via scaffold. (Igor Zubkov, #1336)
 * Improve controller and routing spec calls to `routes` by using `yield`
   instead of `call`. (Anton Davydov, #1308)
-* Add support for `ActiveJob` specs as standard `RSpec::Rails::RailsExampleGoup`s
+* Add support for `ActiveJob` specs as standard `RSpec::Rails::RailsExampleGroup`s
   via both `type: :job` and inferring type from spec directory `spec/jobs`.
   (Gabe Martin-Dempesy, #1361)
 * Include `RSpec::Rails::FixtureSupport` into example groups using metadata
diff --git a/Gemfile b/Gemfile
index cd84a10b95..688f8d4999 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,6 @@ gem 'yard', '~> 0.9.24', require: false
 group :documentation do
   gem 'github-markup', '~> 3.0.3'
   gem 'redcarpet', '~> 3.5.1', platforms: [:ruby]
-  gem 'relish', '~> 0.7.1'
 end
 
 gem 'capybara'
diff --git a/Gemfile-rails-dependencies b/Gemfile-rails-dependencies
index 83c1e78412..d8487f7fa7 100644
--- a/Gemfile-rails-dependencies
+++ b/Gemfile-rails-dependencies
@@ -11,8 +11,15 @@ 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]
+def add_sqlite3_gem_dependency
+  # sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
+  if RUBY_VERSION.to_f < 3
+    # sqlite3 1.7.x doesn't work on all platforms for Ruby 2.x
+    gem 'sqlite3', '~> 1.4', '< 1.7', platforms: [:ruby]
+  else
+    gem 'sqlite3', '~> 1.4', platforms: [:ruby]
+  end
+end
 
 if RUBY_VERSION.to_f < 2.7
   gem 'puma', '< 6.0.0'
@@ -25,6 +32,9 @@ when /main/
   gem "rails", :git => "https://github.com/rails/rails.git"
   gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
   gem 'selenium-webdriver', require: false
+
+  # Rails 8 requires 2.0.0
+  gem 'sqlite3', '~> 2.0', platforms: [:ruby]
 when /stable$/
   gem_list = %w[rails railties actionmailer actionpack activerecord activesupport activejob actionview]
   gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
@@ -32,14 +42,25 @@ when /stable$/
   gem_list.each do |rails_gem|
     gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
   end
+  add_sqlite3_gem_dependency
 when nil, false, ""
   gem "rails", "~> 7.0.0"
   gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
   gem 'selenium-webdriver', require: false
+  add_sqlite3_gem_dependency
 else
-  add_net_gems_dependency if version.split(' ').last < '7.0'
+  version_number = version.split(' ').last
+  add_net_gems_dependency if version_number < '7.0'
 
   gem "rails", version
   gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
-  gem 'selenium-webdriver', require: false
+
+  # This version number reflects our build version not our actual version,
+  # this will be fixed in 7.1.4 and should be removed then.
+  if version_number == '7.1.0'
+    gem 'selenium-webdriver', '< 4.20.0', require: false
+  else
+    gem 'selenium-webdriver', require: false
+  end
+  add_sqlite3_gem_dependency
 end
diff --git a/Gemfile-rspec-dependencies b/Gemfile-rspec-dependencies
index c2abb466ce..a0af7b2f58 100644
--- a/Gemfile-rspec-dependencies
+++ b/Gemfile-rspec-dependencies
@@ -4,6 +4,10 @@ branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp
   if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
     gem lib, :path => library_path, :require => false
   else
-    gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch, :require => false
+    if lib == 'rspec'
+      gem 'rspec', :git => "https://github.com/rspec/rspec-metagem.git", :branch => branch, :require => false
+    else
+      gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch, :require => false
+    end
   end
 end
diff --git a/README.md b/README.md
index 7c7098fa0f..522e90b0b6 100644
--- a/README.md
+++ b/README.md
@@ -25,13 +25,14 @@ According to [RSpec Rails new versioning strategy][] use:
 [`rspec-rails` 3.x]: https://github.com/rspec/rspec-rails/tree/3-9-maintenance
 [`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-0-maintenance
+[`rspec-rails` 6.x]: https://github.com/rspec/rspec-rails/tree/6-1-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 current development build.
-See the [`6-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/6-0-maintenance) if you want or require the latest stable release.
+**IMPORTANT** This README / branch refers to the 6.1.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.
 
 1. Add `rspec-rails` to **both** the `:development` and `:test` groups
    of your app’s `Gemfile`:
@@ -39,7 +40,7 @@ See the [`6-0-maintenance` branch on Github](https://github.com/rspec/rspec-rail
    ```ruby
    # Run against this stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 6.0.0'
+     gem 'rspec-rails', '~> 6.1.0'
    end
 
    # Or, run against the main branch
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..da9c516dd7
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,5 @@
+## Security contact information
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.
diff --git a/example_app_generator/ci_retry_bundle_install.sh b/example_app_generator/ci_retry_bundle_install.sh
index bcc4467919..459097d379 100755
--- a/example_app_generator/ci_retry_bundle_install.sh
+++ b/example_app_generator/ci_retry_bundle_install.sh
@@ -4,8 +4,4 @@ set -e
 source FUNCTIONS_SCRIPT_FILE
 
 echo "Starting bundle install using shared bundle path"
-if is_mri; then
-  travis_retry eval "RUBYOPT=$RUBYOPT:' --enable rubygems' bundle install --gemfile ./Gemfile --path REPLACE_BUNDLE_PATH --retry=3 --jobs=3"
-else
-  travis_retry eval "bundle install --gemfile ./Gemfile --path REPLACE_BUNDLE_PATH --retry=3 --jobs=3"
-fi
+ci_retry eval "RUBYOPT=$RUBYOPT:' --enable rubygems' bundle install --gemfile ./Gemfile --path REPLACE_BUNDLE_PATH --retry=3 --jobs=3"
diff --git a/example_app_generator/generate_app.rb b/example_app_generator/generate_app.rb
index 4b2c539d5c..b9a97e0cb7 100644
--- a/example_app_generator/generate_app.rb
+++ b/example_app_generator/generate_app.rb
@@ -11,6 +11,7 @@
   'ci_retry_bundle_install.sh'
 )
 function_script_file = File.join(rspec_rails_repo_path, 'script/functions.sh')
+capybara_backport_path = File.join(rspec_rails_repo_path, 'example_app_generator/spec/support/capybara.rb')
 
 in_root do
   prepend_to_file "Rakefile", "require 'active_support/all'"
@@ -28,8 +29,14 @@
 
   gsub_file "Gemfile", /.*rails-controller-testing.*/, "gem 'rails-controller-testing', git: 'https://github.com/rails/rails-controller-testing'"
 
-  # sqlite3 is an optional, unspecified, dependency and Rails 6.0 only supports `~> 1.4`
-  gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4'"
+  # sqlite3 is an optional, unspecified, dependency of which Rails 6.0 only supports `~> 1.4`, Ruby 2.7 only supports < 1.7 and Rails 8.0 only supports `~> 2.0`
+  if RUBY_VERSION.to_f < 3
+    gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4', '< 1.7'"
+  elsif Rails::VERSION::STRING > '8'
+    gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 2.0'"
+  else
+    gsub_file "Gemfile", /.*gem..sqlite3.*/, "gem 'sqlite3', '~> 1.4'"
+  end
 
   # remove webdrivers
   gsub_file "Gemfile", /gem ['"]webdrivers['"]/, ""
@@ -60,6 +67,8 @@
             bundle_install_path
   chmod 'ci_retry_bundle_install.sh', 0755
 
+  copy_file capybara_backport_path, 'spec/support/capybara.rb'
+
   if Rails::VERSION::STRING > '7'
     create_file 'app/assets/config/manifest.js' do
       "//= link application.css"
diff --git a/example_app_generator/generate_stuff.rb b/example_app_generator/generate_stuff.rb
index af074104fa..57e2f705dc 100644
--- a/example_app_generator/generate_stuff.rb
+++ b/example_app_generator/generate_stuff.rb
@@ -146,6 +146,7 @@ def using_source_path(path)
 end
 
 gsub_file 'spec/spec_helper.rb', /^=(begin|end)/, ''
+gsub_file 'spec/rails_helper.rb', /^# Rails\.root\.glob\('spec.support/, "Rails.root.glob('spec/support"
 
 # Warnings are too noisy in the sample apps
 gsub_file 'spec/spec_helper.rb',
diff --git a/example_app_generator/spec/support/capybara.rb b/example_app_generator/spec/support/capybara.rb
new file mode 100644
index 0000000000..1857791f92
--- /dev/null
+++ b/example_app_generator/spec/support/capybara.rb
@@ -0,0 +1,51 @@
+# This is a backport of a fix that was included in capybara 3.40.0 which was also Ruby version locked to 3.0+
+if RUBY_VERSION.to_f < 3 && Rails::VERSION::STRING.to_f >= 7.1
+  Capybara.register_server :puma do |app, port, host, **options|
+    begin
+      require 'rackup'
+    rescue LoadError # rubocop:disable Lint/SuppressedException
+    end
+    begin
+      require 'rack/handler/puma'
+    rescue LoadError
+      raise LoadError, 'Capybara is unable to load `puma` for its server, please add `puma` ' \
+        'to your project or specify a different server via something like `Capybara.server = :webrick`.'
+    end
+    puma_rack_handler = defined?(Rackup::Handler::Puma) ? Rackup::Handler::Puma : Rack::Handler::Puma
+
+    unless puma_rack_handler.respond_to?(:config)
+      raise LoadError, 'Capybara requires `puma` version 3.8.0 or higher,' \
+        ' please upgrade `puma` or register and specify your own server block'
+    end
+
+    # If we just run the Puma Rack handler it installs signal handlers which prevent us from being able to interrupt tests.
+    # Therefore construct and run the Server instance ourselves.
+    # puma_rack_handler.run(app, { Host: host, Port: port, Threads: "0:4", workers: 0, daemon: false }.merge(options))
+    default_options = { Host: host, Port: port, Threads: '0:4', workers: 0, daemon: false }
+    options = default_options.merge(options)
+
+    conf = puma_rack_handler.config(app, options)
+    conf.clamp
+
+    puma_ver = Gem::Version.new(Puma::Const::PUMA_VERSION)
+    require 'capybara/registrations/patches/puma_ssl' if Gem::Requirement.new('>=4.0.0', '< 4.1.0').satisfied_by?(puma_ver)
+
+    logger = (defined?(Puma::LogWriter) ? Puma::LogWriter : Puma::Events).then do |cls|
+      conf.options[:Silent] ? cls.strings : cls.stdio
+    end
+    conf.options[:log_writer] = logger
+
+    logger.log 'Capybara starting Puma...'
+    logger.log "* Version #{Puma::Const::PUMA_VERSION}, codename: #{Puma::Const::CODE_NAME}"
+    logger.log "* Min threads: #{conf.options[:min_threads]}, max threads: #{conf.options[:max_threads]}"
+
+    Puma::Server.new(
+      conf.app,
+      defined?(Puma::LogWriter) ? nil : logger,
+      conf.options
+    ).tap do |s|
+      s.binder.parse conf.options[:binds], (s.log_writer rescue s.events) # rubocop:disable Style/RescueModifier
+      s.min_threads, s.max_threads = conf.options[:min_threads], conf.options[:max_threads] if s.respond_to? :min_threads=
+    end.run.join
+  end
+end
diff --git a/example_app_generator/spec/verify_mailer_preview_path_spec.rb b/example_app_generator/spec/verify_mailer_preview_path_spec.rb
index 50f1454972..b35b285faf 100644
--- a/example_app_generator/spec/verify_mailer_preview_path_spec.rb
+++ b/example_app_generator/spec/verify_mailer_preview_path_spec.rb
@@ -38,7 +38,7 @@ def capture_exec(*ops)
     CaptureExec.new(out, $?.exitstatus)
   end
 
-  if ENV['RAILS_VERSION'] == 'main' && Rails::VERSION::STRING == "7.2.0.alpha"
+  if ENV['RAILS_VERSION'] == 'main' && Rails::VERSION::STRING == "8.0.0.alpha"
     before do
       skip('This is broken on Rails main but is skipped for green builds of 7.1.x, please fix')
     end
diff --git a/example_app_generator/spec/verify_view_path_stub_spec.rb b/example_app_generator/spec/verify_view_path_stub_spec.rb
index 60a9d4110d..985ccced0a 100644
--- a/example_app_generator/spec/verify_view_path_stub_spec.rb
+++ b/example_app_generator/spec/verify_view_path_stub_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe "verify view path doesnt leak stubs between examples", type: :view, order: :defined do
+RSpec.describe "verify view path doesn't leak stubs between examples", type: :view, order: :defined do
   subject(:html) do
     render partial: "example"
     rendered
diff --git a/features/Generators.md b/features/Generators.md
index f3a6ef2f1b..61fc83fece 100644
--- a/features/Generators.md
+++ b/features/Generators.md
@@ -10,7 +10,9 @@ out of the box for with Rails' defaults.
 
 RSpec generators can also be run independently. For instance,
 
-    rails generate rspec:model widget
+```console
+rails generate rspec:model widget
+```
 
 will create a new spec file in `spec/models/widget_spec.rb`.
 
diff --git a/features/GettingStarted.md b/features/GettingStarted.md
index 7e251ed6e4..0f3ea79385 100644
--- a/features/GettingStarted.md
+++ b/features/GettingStarted.md
@@ -2,28 +2,40 @@
 
 Install Rails 6
 
-    $ gem install rails -v "~> 6.0.0"
+```console
+$ gem install rails -v "~> 6.0.0"
+```
 
 ### Generate an app
 
-    $ rails new example_app
-    $ cd example_app
+```console
+$ rails new example_app
+$ cd example_app
+```
 
 ### Add `rspec-rails` to the Gemfile
 
-    $ echo 'gem "rspec-rails", group: [:development, :test]' >> Gemfile
+```console
+$ echo 'gem "rspec-rails", group: [:development, :test]' >> Gemfile
+```
 
 ### Install the bundle
 
-    $ bundle install
+```console
+$ bundle install
+```
 
 ### Bootstrap RSpec
 
-    $ rails generate rspec:install
+```console
+$ rails generate rspec:install
+```
 
 ### Generate a scaffold
 
-    $ rails generate scaffold Widget name:string
+```console
+$ rails generate scaffold Widget name:string
+```
 
 This generates files in the `app` and `spec` directories. The files in the
 `app` directory are generated by Rails, and Rails delegates the generation of
@@ -31,15 +43,21 @@ the files in the `spec` directory to RSpec.
 
 ### Run migrations
 
-    $ rails db:migrate && rails db:test:prepare
+```console
+$ rails db:migrate && rails db:test:prepare
+```
 
 ### Run RSpec
 
-    $ rake spec
+```console
+$ rake spec
+```
 
 or
 
-    $ rspec spec --format documentation
+```console
+$ rspec spec --format documentation
+```
 
 If all went well, you should see output ending with:
 
diff --git a/features/README.md b/features/README.md
index 5fb816609c..e60cff5d21 100644
--- a/features/README.md
+++ b/features/README.md
@@ -15,7 +15,9 @@ for even older versions.
 
 ## Install
 
-    gem install rspec-rails
+```console
+gem install rspec-rails
+```
 
 This installs the following gems:
 
@@ -29,23 +31,29 @@ This installs the following gems:
 
 Add rspec-rails to the :test and :development groups in the Gemfile:
 
-    group :test, :development do
-      gem 'rspec-rails', '~> 6.0.0'
-    end
+```ruby
+group :test, :development do
+  gem 'rspec-rails', '~> 6.0.0'
+end
+```
 
 It needs to be in the :development group to expose generators and rake tasks
 without having to type RAILS_ENV=test.
 
 Now you can run:
 
-    bundle exec rails generate rspec:install
+```console
+bundle exec rails generate rspec:install
+```
 
 This adds the spec directory and some skeleton files, including a .rspec
 file.
 
 You can also customize the default spec path with `--default-path` option:
 
-    bundle exec rails generate rspec:install --default-path behaviour
+```console
+bundle exec rails generate rspec:install --default-path behaviour
+```
 
 ## Issues
 
diff --git a/features/Transactions.md b/features/Transactions.md
index 8dfc8cf55d..1fcc34fcb7 100644
--- a/features/Transactions.md
+++ b/features/Transactions.md
@@ -3,9 +3,11 @@
 When you run `rails generate rspec:install`, the `spec/rails_helper.rb` file
 includes the following configuration:
 
-    RSpec.configure do |config|
-      config.use_transactional_fixtures = true
-    end
+```ruby
+RSpec.configure do |config|
+  config.use_transactional_fixtures = true
+end
+```
 
 The name of this setting is a bit misleading. What it really means in Rails
 is "run every test method within a transaction." In the context of rspec-rails,
@@ -21,9 +23,11 @@ If you prefer to manage the data yourself, or using another tool like
 [database_cleaner](https://github.com/bmabey/database_cleaner) to do it for you,
 simply tell RSpec to tell Rails not to manage transactions:
 
-    RSpec.configure do |config|
-      config.use_transactional_fixtures = false
-    end
+```ruby
+RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+end
+```
 
 ### Data created in `before(:example)` are rolled back
 
@@ -32,19 +36,21 @@ the example. This is a good thing because it means that each example is
 isolated from state that would otherwise be left around by the examples that
 already ran. For example:
 
-    describe Widget do
-      before(:example) do
-        @widget = Widget.create
-      end
+```ruby
+describe Widget do
+  before(:example) do
+    @widget = Widget.create
+  end
 
-      it "does something" do
-        expect(@widget).to do_something
-      end
+  it "does something" do
+    expect(@widget).to do_something
+  end
 
-      it "does something else" do
-        expect(@widget).to do_something_else
-      end
-    end
+  it "does something else" do
+    expect(@widget).to do_something_else
+  end
+end
+```
 
 The `@widget` is recreated in each of the two examples above, so each example
 has a different object, _and_ the underlying data is rolled back so the data
@@ -60,27 +66,31 @@ guidelines:
 
 1.  Be sure to clean up any data in an `after(:context)` hook:
 
-        before(:context) do
-          @widget = Widget.create!
-        end
+    ```ruby
+    before(:context) do
+      @widget = Widget.create!
+    end
 
-        after(:context) do
-          @widget.destroy
-        end
+    after(:context) do
+      @widget.destroy
+    end
+    ```
 
     If you don't do that, you'll leave data lying around that will eventually
-    interfere with other examples.
+interfere with other examples.
 
 2.  Reload the object in a `before(:example)` hook.
 
-        before(:context) do
-          @widget = Widget.create!
-        end
+    ```ruby
+    before(:context) do
+      @widget = Widget.create!
+    end
 
-        before(:example) do
-          @widget.reload
-        end
+    before(:example) do
+      @widget.reload
+    end
+    ```
 
-      Even though database updates in each example will be rolled back, the
-      object won't _know_ about those rollbacks so the object and its backing
-      data can easily get out of sync.
+Even though database updates in each example will be rolled back, the
+object won't _know_ about those rollbacks so the object and its backing
+data can easily get out of sync.
diff --git a/features/controller_specs/README.md b/features/controller_specs/README.md
index 39ba99c542..fdf6785765 100644
--- a/features/controller_specs/README.md
+++ b/features/controller_specs/README.md
@@ -42,21 +42,23 @@ To specify outcomes, you can use:
 
 ## Examples
 
-    RSpec.describe TeamsController do
-      describe "GET index" do
-        it "assigns @teams" do
-          team = Team.create
-          get :index
-          expect(assigns(:teams)).to eq([team])
-        end
-
-        it "renders the index template" do
-          get :index
-          expect(response).to render_template("index")
-        end
-      end
+```ruby
+RSpec.describe TeamsController do
+  describe "GET index" do
+    it "assigns @teams" do
+      team = Team.create
+      get :index
+      expect(assigns(:teams)).to eq([team])
     end
 
+    it "renders the index template" do
+      get :index
+      expect(response).to render_template("index")
+    end
+  end
+end
+```
+
 ## Views
 
 * by default, views are not rendered. See
@@ -67,14 +69,16 @@ To specify outcomes, you can use:
 
 We encourage you to use [request specs](./request-specs/request-spec) if you want to set headers in your call. If you still want to use controller specs with custom http headers you can use `request.headers`:
 
-    require "rails_helper"
+```ruby
+require "rails_helper"
 
-    RSpec.describe TeamsController, type: :controller do
-      describe "GET index" do
-        it "returns a 200" do
-          request.headers["Authorization"] = "foo"
-          get :show
-          expect(response).to have_http_status(:ok)
-        end
-      end
+RSpec.describe TeamsController, type: :controller do
+  describe "GET index" do
+    it "returns a 200" do
+      request.headers["Authorization"] = "foo"
+      get :show
+      expect(response).to have_http_status(:ok)
     end
+  end
+end
+```
diff --git a/features/directory_structure.feature b/features/directory_structure.feature
index 62150cf67a..f52d8b7534 100644
--- a/features/directory_structure.feature
+++ b/features/directory_structure.feature
@@ -113,7 +113,7 @@ Feature: The directory structure
       lib
       ├── country_map.rb
       ├── development_mail_interceptor.rb
-      ├── enviroment_mail_interceptor.rb
+      ├── environment_mail_interceptor.rb
       └── tasks
           └── irc.rake
       spec
diff --git a/features/generator_specs/generator_specs.feature b/features/generator_specs/generator_specs.feature
index 2f9da13e5e..c5a00c40b4 100644
--- a/features/generator_specs/generator_specs.feature
+++ b/features/generator_specs/generator_specs.feature
@@ -12,7 +12,7 @@ Feature: Generator spec
             create  lib/generators/my_generator/USAGE
             create  lib/generators/my_generator/templates
             invoke  rspec
-            create    spec/generator/my_generators_generator_spec.rb
+            create    spec/generator/my_generator_generator_spec.rb
       """
 
   Scenario: Use custom generator with customized `default-path`
@@ -29,5 +29,5 @@ Feature: Generator spec
             create  lib/generators/my_generator/USAGE
             create  lib/generators/my_generator/templates
             invoke  rspec
-            create    behaviour/generator/my_generators_generator_spec.rb
+            create    behaviour/generator/my_generator_generator_spec.rb
       """
diff --git a/features/generator_specs/mailer_specs.feature b/features/generator_specs/mailer_specs.feature
index 26f171969c..550fe369ae 100644
--- a/features/generator_specs/mailer_specs.feature
+++ b/features/generator_specs/mailer_specs.feature
@@ -13,10 +13,10 @@ Feature: Mailer generator spec
             create    app/views/posts_mailer/show.text.erb
             create    app/views/posts_mailer/show.html.erb
             invoke  rspec
-            create    spec/mailers/posts_spec.rb
+            create    spec/mailers/posts_mailer_spec.rb
             create    spec/fixtures/posts/index
             create    spec/fixtures/posts/show
-            create    spec/mailers/previews/posts_preview.rb
+            create    spec/mailers/previews/posts_mailer_preview.rb
       """
 
   Scenario: Mailer generator with customized `default-path`
@@ -36,8 +36,8 @@ Feature: Mailer generator spec
             create    app/views/posts_mailer/show.text.erb
             create    app/views/posts_mailer/show.html.erb
             invoke  rspec
-            create    behaviour/mailers/posts_spec.rb
+            create    behaviour/mailers/posts_mailer_spec.rb
             create    behaviour/fixtures/posts/index
             create    behaviour/fixtures/posts/show
-            create    behaviour/mailers/previews/posts_preview.rb
+            create    behaviour/mailers/previews/posts_mailer_preview.rb
       """
diff --git a/features/mailer_specs/README.md b/features/mailer_specs/README.md
index 555cc4851b..466b2d707f 100644
--- a/features/mailer_specs/README.md
+++ b/features/mailer_specs/README.md
@@ -1,4 +1,4 @@
-# Mailer sepcs
+# Mailer specs
 
 By default Mailer specs reside in the `spec/mailers` folder. Adding the metadata
 `type: :mailer` to any context makes its examples be treated as mailer specs.
@@ -9,20 +9,22 @@ behavior and expectations.
 
 ## Examples
 
-    require "rails_helper"
+```ruby
+require "rails_helper"
 
-    RSpec.describe Notifications, type: :mailer do
-      describe "notify" do
-        let(:mail) { Notifications.signup }
+RSpec.describe Notifications, type: :mailer do
+  describe "notify" do
+    let(:mail) { Notifications.signup }
 
-        it "renders the headers" do
-          expect(mail.subject).to eq("Signup")
-          expect(mail.to).to eq(["to@example.org"])
-          expect(mail.from).to eq(["from@example.com"])
-        end
+    it "renders the headers" do
+      expect(mail.subject).to eq("Signup")
+      expect(mail.to).to eq(["to@example.org"])
+      expect(mail.from).to eq(["from@example.com"])
+    end
 
-        it "renders the body" do
-          expect(mail.body.encoded).to match("Hi")
-        end
-      end
+    it "renders the body" do
+      expect(mail.body.encoded).to match("Hi")
     end
+  end
+end
+```
diff --git a/features/matchers/README.md b/features/matchers/README.md
index 78810444b4..1fc7b53884 100644
--- a/features/matchers/README.md
+++ b/features/matchers/README.md
@@ -5,16 +5,22 @@ rspec-compatible wrappers for Rails' assertions.
 
 ### redirects
 
-    # delegates to assert_redirected_to
-    expect(response).to redirect_to(path)
+```ruby
+# delegates to assert_redirected_to
+expect(response).to redirect_to(path)
+```
 
 ### templates
 
-    # delegates to assert_template
-    expect(response).to render_template(template_name)
+```ruby
+# delegates to assert_template
+expect(response).to render_template(template_name)
+```
 
 ### assigned objects
 
-    # passes if assigns(:widget) is an instance of Widget
-    # and it is not persisted
-    expect(assigns(:widget)).to be_a_new(Widget)
+```ruby
+# passes if assigns(:widget) is an instance of Widget
+# and it is not persisted
+expect(assigns(:widget)).to be_a_new(Widget)
+```
diff --git a/features/model_specs/README.md b/features/model_specs/README.md
index 418a4a3037..820c3ac24d 100644
--- a/features/model_specs/README.md
+++ b/features/model_specs/README.md
@@ -9,15 +9,17 @@ behavior and expectations.
 
 ## Examples
 
-    require "rails_helper"
+```ruby
+require "rails_helper"
 
-    RSpec.describe Post, type: :model do
-      context "with 2 or more comments" do
-        it "orders them in reverse chronologically" do
-          post = Post.create!
-          comment1 = post.comments.create!(:body => "first comment")
-          comment2 = post.comments.create!(:body => "second comment")
-          expect(post.reload.comments).to eq([comment2, comment1])
-        end
-      end
+RSpec.describe Post, type: :model do
+  context "with 2 or more comments" do
+    it "orders them in reverse chronologically" do
+      post = Post.create!
+      comment1 = post.comments.create!(:body => "first comment")
+      comment2 = post.comments.create!(:body => "second comment")
+      expect(post.reload.comments).to eq([comment2, comment1])
     end
+  end
+end
+```
diff --git a/features/request_specs/request_spec.feature b/features/request_specs/request_spec.feature
index 1a27f7a5ab..d1f915db69 100644
--- a/features/request_specs/request_spec.feature
+++ b/features/request_specs/request_spec.feature
@@ -17,8 +17,10 @@ Feature: Request specs
 
   RSpec provides two matchers that delegate to Rails assertions:
 
-      render_template # delegates to assert_template
-      redirect_to     # delegates to assert_redirected_to
+  ```ruby
+  render_template # delegates to assert_template
+  redirect_to     # delegates to assert_redirected_to
+  ```
 
   Check the Rails docs for details on these methods as well.
 
diff --git a/features/routing_specs/README.md b/features/routing_specs/README.md
index fc8922be93..8695c85f3a 100644
--- a/features/routing_specs/README.md
+++ b/features/routing_specs/README.md
@@ -7,12 +7,16 @@ Simple apps with nothing but standard RESTful routes won't get much value from
 routing specs, but they can provide significant value when used to specify
 customized routes, like vanity links, slugs, etc.
 
-    expect(:get => "/articles/2012/11/when-to-use-routing-specs").to route_to(
-      :controller => "articles",
-      :month => "2012-11",
-      :slug => "when-to-use-routing-specs"
-    )
+```ruby
+expect(:get => "/articles/2012/11/when-to-use-routing-specs").to route_to(
+  :controller => "articles",
+  :month => "2012-11",
+  :slug => "when-to-use-routing-specs"
+)
+```
 
 They are also valuable for routes that should not be available:
 
-    expect(:delete => "/accounts/37").not_to be_routable
+```ruby
+expect(:delete => "/accounts/37").not_to be_routable
+```
diff --git a/features/routing_specs/route_to_matcher.feature b/features/routing_specs/route_to_matcher.feature
index 4253dd3d23..19ed0fd491 100644
--- a/features/routing_specs/route_to_matcher.feature
+++ b/features/routing_specs/route_to_matcher.feature
@@ -4,11 +4,14 @@ Feature: `route_to` matcher
   It is most valuable when specifying routes other than standard RESTful
   routes.
 
-      expect(get("/")).to route_to("welcome#index") # new in 2.6.0
-
-      or
-
-      expect(:get => "/").to route_to(:controller => "welcome")
+  ```ruby
+  expect(get("/")).to route_to("welcome#index") # new in 2.6.0
+  ```
+  or
+
+  ```ruby
+  expect(:get => "/").to route_to(:controller => "welcome")
+  ```
 
   Scenario: Passing route spec with shortcut syntax
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
diff --git a/features/support/env.rb b/features/support/env.rb
index 0eb42150f3..efac1e71ec 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -59,10 +59,20 @@ def with_unbundled_env
   # We want fresh `example_app` project with empty `spec` dir except helpers.
   # FileUtils.cp_r on Ruby 1.9.2 doesn't preserve permissions.
   system('cp', '-r', example_app_dir, aruba_dir)
-  helpers = %w[spec/spec_helper.rb spec/rails_helper.rb]
-  Dir["#{aruba_dir}/spec/*"].each do |path|
+  helpers = %w[spec/spec_helper.rb spec/rails_helper.rb spec/support/capybara.rb]
+  directories = []
+
+  Dir["#{aruba_dir}/spec/**/*"].each do |path|
     next if helpers.any? { |helper| path.end_with?(helper) }
 
+    # Because we now check for things like spec/support we only want to delete empty directories
+    if File.directory?(path)
+      directories << path
+      next
+    end
+
     FileUtils.rm_rf(path)
   end
+
+  directories.each { |dir| FileUtils.rm_rf(dir) if Dir.empty?(dir) }
 end
diff --git a/lib/generators/rspec/generator/generator_generator.rb b/lib/generators/rspec/generator/generator_generator.rb
index 40118e83a2..76228ee185 100644
--- a/lib/generators/rspec/generator/generator_generator.rb
+++ b/lib/generators/rspec/generator/generator_generator.rb
@@ -4,7 +4,7 @@ module Rspec
   module Generators
     # @private
     class GeneratorGenerator < Base
-      class_option :generator_specs, type: :boolean, default: true,  desc: "Generate generator specs"
+      class_option :generator_specs, type: :boolean, default: true, desc: 'Generate generator specs'
 
       def generate_generator_spec
         return unless options[:generator_specs]
@@ -17,7 +17,7 @@ def template_name
       end
 
       def filename
-        "#{table_name}_generator_spec.rb"
+        "#{file_name}_generator_spec.rb"
       end
     end
   end
diff --git a/lib/generators/rspec/generator/templates/generator_spec.rb b/lib/generators/rspec/generator/templates/generator_spec.rb
index 146713908d..e755cddf7b 100644
--- a/lib/generators/rspec/generator/templates/generator_spec.rb
+++ b/lib/generators/rspec/generator/templates/generator_spec.rb
@@ -1,6 +1,5 @@
 require 'rails_helper'
 
-RSpec.describe "<%= class_name.pluralize %>", <%= type_metatag(:generator) %> do
-
+RSpec.describe "<%= class_name %>Generator", <%= type_metatag(:generator) %> do
   pending "add some scenarios (or delete) #{__FILE__}"
 end
diff --git a/lib/generators/rspec/install/templates/spec/rails_helper.rb b/lib/generators/rspec/install/templates/spec/rails_helper.rb
index 166d47d5d6..afb68850e9 100644
--- a/lib/generators/rspec/install/templates/spec/rails_helper.rb
+++ b/lib/generators/rspec/install/templates/spec/rails_helper.rb
@@ -20,7 +20,7 @@
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Rails.root.glob('spec/support/**/*.rb').sort.each { |f| require f }
+# 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.
diff --git a/lib/generators/rspec/mailer/mailer_generator.rb b/lib/generators/rspec/mailer/mailer_generator.rb
index 7aeb10eeac..8e3677ab61 100644
--- a/lib/generators/rspec/mailer/mailer_generator.rb
+++ b/lib/generators/rspec/mailer/mailer_generator.rb
@@ -8,7 +8,8 @@ class MailerGenerator < Base
       argument :actions, type: :array, default: [], banner: "method method"
 
       def generate_mailer_spec
-        template "mailer_spec.rb", target_path('mailers', class_path, "#{file_name}_spec.rb")
+        file_suffix = file_name.end_with?('mailer') ? 'spec.rb' : 'mailer_spec.rb'
+        template "mailer_spec.rb", target_path('mailers', class_path, [file_name, file_suffix].join('_'))
       end
 
       def generate_fixtures_files
@@ -21,7 +22,8 @@ def generate_fixtures_files
       def generate_preview_files
         return unless RSpec::Rails::FeatureCheck.has_action_mailer_preview?
 
-        template "preview.rb", target_path("mailers/previews", class_path, "#{file_name}_preview.rb")
+        file_suffix = file_name.end_with?('mailer') ? 'preview.rb' : 'mailer_preview.rb'
+        template "preview.rb", target_path("mailers/previews", class_path, [file_name, file_suffix].join('_'))
       end
     end
   end
diff --git a/lib/generators/rspec/mailer/templates/preview.rb b/lib/generators/rspec/mailer/templates/preview.rb
index 2f35c9e51b..37d4dc1733 100644
--- a/lib/generators/rspec/mailer/templates/preview.rb
+++ b/lib/generators/rspec/mailer/templates/preview.rb
@@ -1,9 +1,9 @@
 <% module_namespacing do -%>
-# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>
-class <%= class_name %>Preview < ActionMailer::Preview
+# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>_mailer
+class <%= class_name %><%= 'Mailer' unless class_name.end_with?('Mailer') %>Preview < ActionMailer::Preview
 <% actions.each do |action| -%>
 
-  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>/<%= action %>
+  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>_mailer/<%= action %>
   def <%= action %>
     <%= class_name.sub(/(Mailer)?$/, 'Mailer') %>.<%= action %>
   end
diff --git a/lib/generators/rspec/scaffold/templates/index_spec.rb b/lib/generators/rspec/scaffold/templates/index_spec.rb
index 4abbc0da09..627b475cfc 100644
--- a/lib/generators/rspec/scaffold/templates/index_spec.rb
+++ b/lib/generators/rspec/scaffold/templates/index_spec.rb
@@ -18,7 +18,7 @@
 
   it "renders a list of <%= ns_table_name %>" do
     render
-    cell_selector = Rails::VERSION::STRING >= '7' ? 'div>p' : 'tr>td'
+    cell_selector = <%= Rails::VERSION::STRING >= '7' ? "'div>p'" : "'tr>td'" %>
 <% for attribute in output_attributes -%>
     assert_select cell_selector, text: Regexp.new(<%= value_for(attribute) %>.to_s), count: 2
 <% end -%>
diff --git a/lib/rspec-rails.rb b/lib/rspec-rails.rb
index 9c16b36a26..8804a67f5d 100644
--- a/lib/rspec-rails.rb
+++ b/lib/rspec-rails.rb
@@ -9,6 +9,7 @@ class Railtie < ::Rails::Railtie
       # As of Rails 5.1.0 you can register directories to work with `rake notes`
       require 'rails/source_annotation_extractor'
       ::Rails::SourceAnnotationExtractor::Annotation.register_directories("spec")
+
       generators = config.app_generators
       generators.integration_tool :rspec
       generators.test_framework :rspec
diff --git a/lib/rspec/rails/configuration.rb b/lib/rspec/rails/configuration.rb
index c21ed2e97d..79f64e38d1 100644
--- a/lib/rspec/rails/configuration.rb
+++ b/lib/rspec/rails/configuration.rb
@@ -170,7 +170,8 @@ 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"
+              message: "Rails 7.1 has deprecated the singular fixture_path in favour of an array." \
+              "You should migrate to plural:"
             )
             fixture_paths&.first
           end
@@ -179,7 +180,8 @@ 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"
+              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
diff --git a/lib/rspec/rails/example/mailbox_example_group.rb b/lib/rspec/rails/example/mailbox_example_group.rb
index de85acdf43..2b6e43c1a0 100644
--- a/lib/rspec/rails/example/mailbox_example_group.rb
+++ b/lib/rspec/rails/example/mailbox_example_group.rb
@@ -69,7 +69,7 @@ def have_failed
       #
       # @param message [Hash, Mail::Message] a mail message or hash of
       #   attributes used to build one
-      # @return [ActionMaibox::InboundMessage]
+      # @return [ActionMailbox::InboundMessage]
       def process(message)
         MailboxExampleGroup.create_inbound_email(message).tap do |mail|
           self.class.mailbox_class.receive(mail)
diff --git a/lib/rspec/rails/example/rails_example_group.rb b/lib/rspec/rails/example/rails_example_group.rb
index 0643b9ae17..ed343de35b 100644
--- a/lib/rspec/rails/example/rails_example_group.rb
+++ b/lib/rspec/rails/example/rails_example_group.rb
@@ -3,6 +3,7 @@
 require 'rspec/rails/matchers'
 
 if ::Rails::VERSION::MAJOR >= 7
+  require 'active_support/current_attributes/test_helper'
   require 'active_support/execution_context/test_helper'
 end
 
@@ -18,6 +19,7 @@ module RailsExampleGroup
       include RSpec::Rails::FixtureSupport
       if ::Rails::VERSION::MAJOR >= 7
         include RSpec::Rails::TaggedLoggingAdapter
+        include ActiveSupport::CurrentAttributes::TestHelper
         include ActiveSupport::ExecutionContext::TestHelper
       end
     end
diff --git a/lib/rspec/rails/example/routing_example_group.rb b/lib/rspec/rails/example/routing_example_group.rb
index 08b7e0455e..6b2c51dcad 100644
--- a/lib/rspec/rails/example/routing_example_group.rb
+++ b/lib/rspec/rails/example/routing_example_group.rb
@@ -1,5 +1,3 @@
-require "action_dispatch/testing/assertions/routing"
-
 module RSpec
   module Rails
     # @private
diff --git a/lib/rspec/rails/fixture_support.rb b/lib/rspec/rails/fixture_support.rb
index b5909f885a..b6727d71b3 100644
--- a/lib/rspec/rails/fixture_support.rb
+++ b/lib/rspec/rails/fixture_support.rb
@@ -43,14 +43,14 @@ module Fixtures
             if ::Rails.version.to_f >= 7.1
               def fixtures(*args)
                 super.tap do
-                  fixture_sets.each_key do |fixture_name|
-                    proxy_method_warning_if_called_in_before_context_scope(fixture_name)
+                  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(fixture_name)
-                define_method(fixture_name) do |*args, **kwargs, &blk|
+              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
diff --git a/lib/rspec/rails/matchers/active_job.rb b/lib/rspec/rails/matchers/active_job.rb
index 944391032c..0a9079b908 100644
--- a/lib/rspec/rails/matchers/active_job.rb
+++ b/lib/rspec/rails/matchers/active_job.rb
@@ -384,33 +384,33 @@ def have_been_enqueued
       #
       # @example
       #     expect {
-      #       perform_jobs { HeavyLiftingJob.perform_later }
+      #       perform_enqueued_jobs { HeavyLiftingJob.perform_later }
       #     }.to have_performed_job
       #
       #     expect {
-      #       perform_jobs {
+      #       perform_enqueued_jobs {
       #         HelloJob.perform_later
       #         HeavyLiftingJob.perform_later
       #       }
       #     }.to have_performed_job(HelloJob).exactly(:once)
       #
       #     expect {
-      #       perform_jobs { 3.times { HelloJob.perform_later } }
+      #       perform_enqueued_jobs { 3.times { HelloJob.perform_later } }
       #     }.to have_performed_job(HelloJob).at_least(2).times
       #
       #     expect {
-      #       perform_jobs { HelloJob.perform_later }
+      #       perform_enqueued_jobs { HelloJob.perform_later }
       #     }.to have_performed_job(HelloJob).at_most(:twice)
       #
       #     expect {
-      #       perform_jobs {
+      #       perform_enqueued_jobs {
       #         HelloJob.perform_later
       #         HeavyLiftingJob.perform_later
       #       }
       #     }.to have_performed_job(HelloJob).and have_performed_job(HeavyLiftingJob)
       #
       #     expect {
-      #       perform_jobs {
+      #       perform_enqueued_jobs {
       #         HelloJob.set(wait_until: Date.tomorrow.noon, queue: "low").perform_later(42)
       #       }
       #     }.to have_performed_job.with(42).on_queue("low").at(Date.tomorrow.noon)
diff --git a/lib/rspec/rails/matchers/have_http_status.rb b/lib/rspec/rails/matchers/have_http_status.rb
index 858ef547b6..cc1b178be9 100644
--- a/lib/rspec/rails/matchers/have_http_status.rb
+++ b/lib/rspec/rails/matchers/have_http_status.rb
@@ -33,7 +33,7 @@ def self.matcher_for_status(target)
         # @param obj [Object] object to convert to a response
         # @return [ActionDispatch::TestResponse]
         def as_test_response(obj)
-          if ::ActionDispatch::Response === obj
+          if ::ActionDispatch::Response === obj || ::Rack::MockResponse === obj
             ::ActionDispatch::TestResponse.from_response(obj)
           elsif ::ActionDispatch::TestResponse === obj
             obj
@@ -216,11 +216,7 @@ def pp_status(status, code)
           # @see Rack::Utils::SYMBOL_TO_STATUS_CODE
           # @raise [ArgumentError] if an associated code could not be found
           def set_expected_code!
-            @expected ||=
-              Rack::Utils::SYMBOL_TO_STATUS_CODE.fetch(expected_status) do
-                raise ArgumentError,
-                      "Invalid HTTP status: #{expected_status.inspect}"
-              end
+            @expected ||= Rack::Utils.status_code(expected_status)
           end
         end
 
diff --git a/lib/rspec/rails/tasks/rspec.rake b/lib/rspec/rails/tasks/rspec.rake
index fc3add7875..f466e61dc0 100644
--- a/lib/rspec/rails/tasks/rspec.rake
+++ b/lib/rspec/rails/tasks/rspec.rake
@@ -5,7 +5,9 @@ end
 
 task default: :spec
 
-task stats: "spec:statsetup"
+if ::Rails::VERSION::STRING < "8.0.0"
+  task stats: "spec:statsetup"
+end
 
 desc "Run all specs in spec directory (excluding plugin specs)"
 RSpec::Core::RakeTask.new(spec: "spec:prepare")
diff --git a/lib/rspec/rails/version.rb b/lib/rspec/rails/version.rb
index 6b754646a6..b7df4ae169 100644
--- a/lib/rspec/rails/version.rb
+++ b/lib/rspec/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
     # Version information for RSpec Rails.
     module Version
       # Current version of RSpec Rails, in semantic versioning format.
-      STRING = '6.1.0.pre'
+      STRING = '6.1.5'
     end
   end
 end
diff --git a/rspec-rails.gemspec b/rspec-rails.gemspec
index f295abfad4..4e5ffec211 100644
--- a/rspec-rails.gemspec
+++ b/rspec-rails.gemspec
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = "rspec@googlegroups.com"
   s.homepage    = "https://github.com/rspec/rspec-rails"
   s.summary     = "RSpec for Rails"
-  s.description = "rspec-rails is a testing framework for Rails 5+."
+  s.description = "rspec-rails integrates the Rails testing helpers into RSpec."
   s.required_ruby_version = ">= 2.5.0"
 
   s.metadata = {
@@ -46,12 +46,9 @@ Gem::Specification.new do |s|
   # get released.
   %w[core expectations mocks support].each do |name|
     if ENV['RSPEC_CI']
-      s.add_runtime_dependency "rspec-#{name}", ENV.fetch('RSPEC_VERSION', '3.13.0.pre')
-    elsif RSpec::Rails::Version::STRING =~ /pre/ # prerelease builds
-      expected_rspec_version = "3.13.0.pre"
-      s.add_runtime_dependency "rspec-#{name}", "= #{expected_rspec_version}"
+      s.add_runtime_dependency "rspec-#{name}", ENV.fetch('RSPEC_VERSION', '3.14.0.pre')
     else
-      expected_rspec_version = "3.12.0"
+      expected_rspec_version = "3.13.0"
       s.add_runtime_dependency "rspec-#{name}", "~> #{expected_rspec_version.split(".")[0..1].join(".")}"
     end
   end
diff --git a/script/ci_functions.sh b/script/ci_functions.sh
deleted file mode 100644
index 4a86428a6b..0000000000
--- a/script/ci_functions.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
-# DO NOT modify it by hand as your changes will get lost the next time it is generated.
-
-# Taken from:
-# https://github.com/travis-ci/travis-build/blob/e9314616e182a23e6a280199cd9070bfc7cae548/lib/travis/build/script/templates/header.sh#L34-L53
-travis_retry() {
-  local result=0
-  local count=1
-  while [ $count -le 3 ]; do
-    [ $result -ne 0 ] && {
-      echo -e "\n\033[33;1mThe command \"$@\" failed. Retrying, $count of 3.\033[0m\n" >&2
-    }
-    "$@"
-    result=$?
-    [ $result -eq 0 ] && break
-    count=$(($count + 1))
-    sleep 1
-  done
-
-  [ $count -eq 3 ] && {
-    echo "\n\033[33;1mThe command \"$@\" failed 3 times.\033[0m\n" >&2
-  }
-
-  return $result
-}
-
-# Taken from https://github.com/vcr/vcr/commit/fa96819c92b783ec0c794f788183e170e4f684b2
-# and https://github.com/vcr/vcr/commit/040aaac5370c68cd13c847c076749cd547a6f9b1
-nano_cmd="$(type -p gdate date | head -1)"
-nano_format="+%s%N"
-[ "$(uname -s)" != "Darwin" ] || nano_format="${nano_format/%N/000000000}"
-
-travis_time_start() {
-  travis_timer_id=$(printf %08x $(( RANDOM * RANDOM )))
-  travis_start_time=$($nano_cmd -u "$nano_format")
-  printf "travis_time:start:%s\r\e[0m" $travis_timer_id
-}
-
-travis_time_finish() {
-  local travis_end_time=$($nano_cmd -u "$nano_format")
-  local duration=$(($travis_end_time-$travis_start_time))
-  printf "travis_time:end:%s:start=%s,finish=%s,duration=%s\r\e[0m" \
-    $travis_timer_id $travis_start_time $travis_end_time $duration
-}
-
-fold() {
-  local name="$1"
-  local status=0
-  shift 1
-  if [ -n "$TRAVIS" ]; then
-    printf "travis_fold:start:%s\r\e[0m" "$name"
-    travis_time_start
-  else
-    echo "============= Starting $name ==============="
-  fi
-
-  "$@"
-  status=$?
-
-  [ -z "$TRAVIS" ] || travis_time_finish
-
-  if [ "$status" -eq 0 ]; then
-    if [ -n "$TRAVIS" ]; then
-      printf "travis_fold:end:%s\r\e[0m" "$name"
-    else
-      echo "============= Ending $name ==============="
-    fi
-  else
-    STATUS="$status"
-  fi
-
-  return $status
-}
diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
index 324031cfaa..8e29ead15c 100755
--- a/script/clone_all_rspec_repos
+++ b/script/clone_all_rspec_repos
@@ -5,17 +5,13 @@
 set -e
 source script/functions.sh
 
-if is_mri; then
-  pushd ..
+pushd ..
 
-  clone_repo "rspec"
-  clone_repo "rspec-core"
-  clone_repo "rspec-expectations"
-  clone_repo "rspec-mocks"
-  clone_repo "rspec-rails"
-  clone_repo "rspec-support"
+clone_repo "rspec-metagem" "rspec"
+clone_repo "rspec-core"
+clone_repo "rspec-expectations"
+clone_repo "rspec-mocks"
+clone_repo "rspec-rails"
+clone_repo "rspec-support"
 
-  popd
-else
-  echo "Not cloning all repos since we are not on MRI and they are only needed for the MRI build"
-fi
+popd
diff --git a/script/custom_build_functions.sh b/script/custom_build_functions.sh
deleted file mode 100644
index 256211d5e7..0000000000
--- a/script/custom_build_functions.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-function run_cukes {
-  if is_mri; then
-    bin/rake acceptance --trace
-    return $?
-  elif is_jruby; then
-    bin/rake smoke:app
-    return $?
-  else
-    return 0
-  fi
-}
-
-# rspec-rails depends on all of the other rspec repos. Conversely, none of the
-# other repos have any dependencies with rspec-rails directly. If the other
-# repos have issues, the rspec-rails suite and cukes would fail exposing them.
-# Since we are already implicitly testing them we do not need to run their spec
-# suites explicitly.
-function run_all_spec_suites {
-  fold "one-by-one specs" run_specs_one_by_one
-}
diff --git a/script/functions.sh b/script/functions.sh
index 702d785bf6..6cbbbe3d6d 100644
--- a/script/functions.sh
+++ b/script/functions.sh
@@ -1,65 +1,73 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
-# DO NOT modify it by hand as your changes will get lost the next time it is generated.
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $SCRIPT_DIR/ci_functions.sh
-source $SCRIPT_DIR/predicate_functions.sh
-
-# If JRUBY_OPTS isn't set, use these.
-# see https://docs.travis-ci.com/user/ci-environment/
-export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
 SPECS_HAVE_RUN_FILE=specs.out
 MAINTENANCE_BRANCH=`cat maintenance-branch`
 
 # Don't allow rubygems to pollute what's loaded. Also, things boot faster
 # without the extra load time of rubygems. Only works on MRI Ruby 1.9+
-if is_mri; then
-  export RUBYOPT="--disable=gem"
-fi
+export RUBYOPT="--disable=gem"
+
+ci_retry() {
+  local result=0
+  local count=1
+  while [ $count -le 3 ]; do
+    [ $result -ne 0 ] && {
+      echo -e "\n\033[33;1mThe command \"$@\" failed. Retrying, $count of 3.\033[0m\n" >&2
+    }
+    "$@"
+    result=$?
+    [ $result -eq 0 ] && break
+    count=$(($count + 1))
+    sleep 1
+  done
 
-function clone_repo {
-  if [ ! -d $1 ]; then # don't clone if the dir is already there
-    travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH"
-  fi;
+  [ $count -eq 3 ] && {
+    echo "\n\033[33;1mThe command \"$@\" failed 3 times.\033[0m\n" >&2
+  }
+
+  return $result
 }
 
-function run_specs_and_record_done {
-  local rspec_bin=bin/rspec
+fold() {
+  local name="$1"
+  local status=0
+  shift 1
+  echo "============= Starting $name ==============="
 
-  # rspec-core needs to run with a special script that loads simplecov first,
-  # so that it can instrument rspec-core's code before rspec-core has been loaded.
-  if [ -f script/rspec_with_simplecov ] && is_mri; then
-    rspec_bin=script/rspec_with_simplecov
-  fi;
+  "$@"
+  status=$?
 
-  echo "${PWD}/bin/rspec"
-  $rspec_bin spec --backtrace --format progress --profile --format progress --out $SPECS_HAVE_RUN_FILE
+  if [ "$status" -eq 0 ]; then
+    echo "============= Ending $name ==============="
+  else
+    STATUS="$status"
+  fi
+
+  return $status
 }
 
-function run_cukes {
-  if [ -d features ]; then
-    # force jRuby to use client mode JVM or a compilation mode that's as close as possible,
-    # idea taken from https://github.com/jruby/jruby/wiki/Improving-startup-time
-    #
-    # Note that we delay setting this until we run the cukes because we've seen
-    # spec failures in our spec suite due to problems with this mode.
-    export JAVA_OPTS='-client -XX:+TieredCompilation -XX:TieredStopAtLevel=1'
-
-    echo "${PWD}/bin/cucumber"
-
-    if is_jruby; then
-      # For some reason JRuby doesn't like our improved bundler setup
-      RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
-         PATH="${PWD}/bin:$PATH" \
-         bin/cucumber --strict
-    else
-      # Prepare RUBYOPT for scenarios that are shelling out to ruby,
-      # and PATH for those that are using `rspec` or `rake`.
-      RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
-         PATH="${PWD}/bin:$PATH" \
-         bin/cucumber --strict
-    fi
+function documentation_enforced {
+  if [ -x ./bin/yard ]; then
+      return 0
+  else
+    return 1
+  fi
+}
+
+function clone_repo {
+  if [ -z "$2" ]; then
+    DIR_TARGET="$1"
+  else
+    DIR_TARGET="$2"
   fi
+
+  if [ ! -d $DIR_TARGET ]; then # don't clone if the dir is already there
+    ci_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH $DIR_TARGET"
+  fi;
+}
+
+function run_specs_and_record_done {
+  echo "${PWD}/bin/rspec"
+  bin/rspec spec --backtrace --format progress --profile --format progress --out $SPECS_HAVE_RUN_FILE
 }
 
 function run_specs_one_by_one {
@@ -71,27 +79,6 @@ function run_specs_one_by_one {
   done
 }
 
-function run_spec_suite_for {
-  if [ ! -f ../$1/$SPECS_HAVE_RUN_FILE ]; then # don't rerun specs that have already run
-    if [ -d ../$1 ]; then
-      echo "Running specs for $1"
-      pushd ../$1
-      unset BUNDLE_GEMFILE
-      bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
-      travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
-      run_specs_and_record_done
-      popd
-    else
-      echo ""
-      echo "WARNING: The ../$1 directory does not exist. Usually the"
-      echo "travis build cds into that directory and run the specs to"
-      echo "ensure the specs still pass with your latest changes, but"
-      echo "we are going to skip that step."
-      echo ""
-    fi;
-  fi;
-}
-
 function check_binstubs {
   echo "Checking required binstubs"
 
@@ -174,16 +161,3 @@ function check_documentation_coverage {
     end
   "
 }
-
-function check_style_and_lint {
-  echo "bin/rubocop"
-  eval "(unset RUBYOPT; rm -rf tmp/*; exec bin/rubocop)"
-}
-
-function run_all_spec_suites {
-  fold "rspec-core specs" run_spec_suite_for "rspec-core"
-  fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
-  fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
-  fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
-  fold "rspec-support specs" run_spec_suite_for "rspec-support"
-}
diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
deleted file mode 100644
index 90067bb10b..0000000000
--- a/script/predicate_functions.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
-# DO NOT modify it by hand as your changes will get lost the next time it is generated.
-
-function is_mri {
-  if ruby -e "exit(!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby')"; then
-    # RUBY_ENGINE only returns 'ruby' on MRI.
-    # MRI 1.8.7 lacks the constant but all other rubies have it (including JRuby in 1.8 mode)
-    return 0
-  else
-    return 1
-  fi;
-}
-
-function is_jruby {
-  if ruby -e "exit(defined?(RUBY_PLATFORM) && RUBY_PLATFORM == 'java')"; then
-    # RUBY_ENGINE only returns 'ruby' on MRI.
-    # MRI 1.8.7 lacks the constant but all other rubies have it (including JRuby in 1.8 mode)
-    return 0
-  else
-    return 1
-  fi;
-}
-
-function is_mri_192 {
-  if is_mri; then
-    if ruby -e "exit(RUBY_VERSION == '1.9.2')"; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
-
-function is_mri_192_plus {
-  if is_mri; then
-    if ruby -e "exit(RUBY_VERSION.to_f > 1.8)"; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
-
-function is_mri_2plus {
-  if is_mri; then
-    if ruby -e "exit(RUBY_VERSION.to_f > 2.0)"; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
-
-function is_ruby_26_plus {
-  if ruby -e "exit(RUBY_VERSION.to_f >= 2.6)"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function is_ruby_23_plus {
-  if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function rspec_rails_compatible {
-  if is_ruby_23_plus; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function rspec_support_compatible {
-  if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ] && [ "$MAINTENANCE_BRANCH" != "2-14-maintenance" ]; then
-    return 0
-  else
-    return 1
-  fi
-}
-
-function additional_specs_available {
-  type run_additional_specs > /dev/null 2>&1
-  return $?
-}
-
-function documentation_enforced {
-  if [ -x ./bin/yard ]; then
-    if is_mri_2plus; then
-      return 0
-    else
-      return 1
-    fi
-  else
-    return 1
-  fi
-}
diff --git a/script/run_build b/script/run_build
index 2938f81c8a..7d1aae56a6 100755
--- a/script/run_build
+++ b/script/run_build
@@ -1,24 +1,14 @@
 #!/bin/bash
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
-# DO NOT modify it by hand as your changes will get lost the next time it is generated.
+# This file is manually managed unlike the rest of core rspec gems because it is independent.
 
 set -e
 source script/functions.sh
 
-# Allow repos to override the default functions and add their own
-if [ -f script/custom_build_functions.sh ]; then
-  source script/custom_build_functions.sh
-fi
-
 fold "binstub check" check_binstubs
 
 fold "specs" run_specs_and_record_done
 
-if additional_specs_available; then
-  fold "additional specs" run_additional_specs
-fi
-
-fold "cukes" run_cukes
+fold "acceptance" bin/rake acceptance --trace
 
 fold "snippets" script/run_snippets.sh
 
@@ -26,9 +16,4 @@ if documentation_enforced; then
   fold "doc check" check_documentation_coverage
 fi
 
-if is_mri; then
-  fold "one-by-one specs" run_specs_one_by_one
-  run_all_spec_suites
-else
-  echo "Skipping the rest of the build on non-MRI rubies"
-fi
+fold "one-by-one specs" run_specs_one_by_one
diff --git a/script/run_rubocop b/script/run_rubocop
index c2d94dcca3..b0e70d7330 100755
--- a/script/run_rubocop
+++ b/script/run_rubocop
@@ -1,14 +1,12 @@
 #!/bin/bash
-# This file was generated on 2022-01-10T22:24:10+00:00 from the rspec-dev repo.
-# DO NOT modify it by hand as your changes will get lost the next time it is generated.
+# This file is manually managed unlike the rest of core rspec gems because it is independent.
 
 set -e
 source script/functions.sh
 
-# Allow repos to override the default functions and add their own
-if [ -f script/custom_build_functions.sh ]; then
-  source script/custom_build_functions.sh
-fi
-
+function check_style_and_lint {
+  echo "bin/rubocop"
+  eval "(unset RUBYOPT; rm -rf tmp/*; exec bin/rubocop)"
+}
 
 fold "rubocop" check_style_and_lint
diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
index 4c386c945b..c85e5dcc42 100755
--- a/script/update_rubygems_and_install_bundler
+++ b/script/update_rubygems_and_install_bundler
@@ -1,19 +1,32 @@
 #!/bin/bash
-# This file was generated on 2019-12-18T14:01:39+00:00 from the rspec-dev repo.
-# DO NOT modify it by hand as your changes will get lost the next time it is generated.
+# This file is manually managed unlike the rest of core rspec gems because it is independent.
 
 set -e
-source script/functions.sh
 
-if is_ruby_26_plus; then
+function is_ruby_3_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 3.0)"; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+function is_ruby_26_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 2.6)"; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+if is_ruby_3_plus; then
   gem update --no-document --system
   gem install --no-document bundler
-elif is_ruby_23_plus; then
+elif is_ruby_26_plus; then
+  gem update --no-document --system '3.4.22'
+  gem install --no-document bundler
+else
   echo "Warning installing older versions of Rubygems / Bundler"
   gem update --system '3.3.26'
   gem install bundler -v '2.3.26'
-else
-  echo "Warning installing older versions of Rubygems / Bundler"
-  gem update --system '2.7.10'
-  gem install bundler -v '1.17.3'
 fi
diff --git a/spec/generators/rspec/channel/channel_generator_spec.rb b/spec/generators/rspec/channel/channel_generator_spec.rb
index 96c5deaada..03c2f79256 100644
--- a/spec/generators/rspec/channel/channel_generator_spec.rb
+++ b/spec/generators/rspec/channel/channel_generator_spec.rb
@@ -5,13 +5,11 @@
 RSpec.describe Rspec::Generators::ChannelGenerator, type: :generator, skip: !RSpec::Rails::FeatureCheck.has_action_cable_testing? do
   setup_default_destination
 
-  describe 'the generated files' do
-    before { run_generator %w[chat] }
+  before { run_generator %w[chat] }
 
-    subject { file("spec/channels/chat_channel_spec.rb") }
+  subject(:channel_spec) { file("spec/channels/chat_channel_spec.rb") }
 
-    it { is_expected.to exist }
-    it { is_expected.to contain(/require 'rails_helper'/) }
-    it { is_expected.to contain(/describe ChatChannel, #{type_metatag(:channel)}/) }
+  it "generates a channel spec file" do
+    expect(channel_spec).to contain(/require 'rails_helper'/).and(contain(/describe ChatChannel, #{type_metatag(:channel)}/))
   end
 end
diff --git a/spec/generators/rspec/controller/controller_generator_spec.rb b/spec/generators/rspec/controller/controller_generator_spec.rb
index 3885194abf..3724c49e20 100644
--- a/spec/generators/rspec/controller/controller_generator_spec.rb
+++ b/spec/generators/rspec/controller/controller_generator_spec.rb
@@ -6,18 +6,17 @@
   setup_default_destination
 
   describe 'request specs' do
-    subject { file('spec/requests/posts_spec.rb') }
+    subject(:filename) { file('spec/requests/posts_spec.rb') }
 
     describe 'generated by default' do
       before do
         run_generator %w[posts]
       end
 
-      describe 'the spec' do
-        it { is_expected.to exist }
-        it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/^RSpec.describe "Posts", #{type_metatag(:request)}/) }
-        it { is_expected.to contain('pending') }
+      it 'includes the standard boilerplate' do
+        expect(filename).to contain(/require 'rails_helper'/)
+                              .and(contain(/^RSpec.describe "Posts", #{type_metatag(:request)}/))
+                              .and(contain('pending'))
       end
     end
 
@@ -25,7 +24,10 @@
       before do
         run_generator %w[posts --no-request_specs]
       end
-      it { is_expected.not_to exist }
+
+      it 'skips the file' do
+        expect(File.exist?(filename)).to be false
+      end
     end
 
     describe 'with actions' do
@@ -33,22 +35,24 @@
         run_generator %w[posts index custom_action]
       end
 
-      it { is_expected.to exist }
-      it { is_expected.to contain('get "/posts/index"') }
-      it { is_expected.to contain('get "/posts/custom_action"') }
+      it 'includes the standard boilerplate' do
+        expect(filename).to contain('get "/posts/index"')
+                             .and(contain('get "/posts/custom_action"'))
+      end
     end
 
     describe 'with namespace and actions' do
-      subject { file('spec/requests/admin/external/users_spec.rb') }
+      subject(:filename) { file('spec/requests/admin/external/users_spec.rb') }
 
       before do
         run_generator %w[admin::external::users index custom_action]
       end
 
-      it { is_expected.to exist }
-      it { is_expected.to contain(/^RSpec.describe "Admin::External::Users", #{type_metatag(:request)}/) }
-      it { is_expected.to contain('get "/admin/external/users/index"') }
-      it { is_expected.to contain('get "/admin/external/users/custom_action"') }
+      it 'includes the standard boilerplate' do
+        expect(filename).to contain(/^RSpec.describe "Admin::External::Users", #{type_metatag(:request)}/)
+                             .and(contain('get "/admin/external/users/index"'))
+                             .and(contain('get "/admin/external/users/custom_action"'))
+      end
     end
   end
 
@@ -58,18 +62,27 @@
         before do
           run_generator %w[posts index show --no-view-specs]
         end
+
         describe 'index.html.erb' do
-          subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { is_expected.not_to exist }
+          subject(:filename) { file('spec/views/posts/index.html.erb_spec.rb') }
+
+          it 'skips the file' do
+            expect(File.exist?(filename)).to be false
+          end
         end
       end
+
       describe 'with no actions' do
         before do
           run_generator %w[posts]
         end
+
         describe 'index.html.erb' do
-          subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { is_expected.not_to exist }
+          subject(:filename) { file('spec/views/posts/index.html.erb_spec.rb') }
+
+          it 'skips the file' do
+            expect(File.exist?(filename)).to be false
+          end
         end
       end
 
@@ -79,8 +92,11 @@
         end
 
         describe 'index.html.erb' do
-          subject { file('spec/views/posts/index.html._spec.rb') }
-          it { is_expected.not_to exist }
+          subject(:filename) { file('spec/views/posts/index.html._spec.rb') }
+
+          it 'skips the file' do
+            expect(File.exist?(filename)).to be false
+          end
         end
       end
     end
@@ -90,46 +106,62 @@
         before do
           run_generator %w[posts index show]
         end
+
         describe 'index.html.erb' do
-          subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { is_expected.to exist }
-          it { is_expected.to contain(/require 'rails_helper'/) }
-          it { is_expected.to contain(/^RSpec.describe "posts\/index.html.erb", #{type_metatag(:view)}/) }
+          subject(:filename) { file('spec/views/posts/index.html.erb_spec.rb') }
+
+          it 'includes the standard boilerplate' do
+            expect(filename).to contain(/require 'rails_helper'/)
+                                 .and(contain(/^RSpec.describe "posts\/index.html.erb", #{type_metatag(:view)}/))
+          end
         end
+
         describe 'show.html.erb' do
-          subject { file('spec/views/posts/show.html.erb_spec.rb') }
-          it { is_expected.to exist }
-          it { is_expected.to contain(/require 'rails_helper'/) }
-          it { is_expected.to contain(/^RSpec.describe "posts\/show.html.erb", #{type_metatag(:view)}/) }
+          subject(:filename) { file('spec/views/posts/show.html.erb_spec.rb') }
+
+          it 'includes the standard boilerplate' do
+            expect(filename).to contain(/require 'rails_helper'/)
+                                 .and(contain(/^RSpec.describe "posts\/show.html.erb", #{type_metatag(:view)}/))
+          end
         end
       end
+
       describe 'with haml' do
         before do
           run_generator %w[posts index --template_engine haml]
         end
+
         describe 'index.html.haml' do
-          subject { file('spec/views/posts/index.html.haml_spec.rb') }
-          it { is_expected.to exist }
-          it { is_expected.to contain(/require 'rails_helper'/) }
-          it { is_expected.to contain(/^RSpec.describe "posts\/index.html.haml", #{type_metatag(:view)}/) }
+          subject(:filename) { file('spec/views/posts/index.html.haml_spec.rb') }
+
+          it 'includes the standard boilerplate' do
+            expect(filename).to contain(/require 'rails_helper'/)
+                                 .and(contain(/^RSpec.describe "posts\/index.html.haml", #{type_metatag(:view)}/))
+          end
         end
       end
     end
 
     describe 'are removed' do
-      subject { run_generator %w[posts], behavior: :revoke }
-      it { is_expected.to match('remove  spec/views/posts') }
+      subject(:output) { run_generator %w[posts], behavior: :revoke }
+
+      it 'will remove the file' do
+        expect(output).to match('remove  spec/views/posts')
+      end
     end
   end
 
   describe 'routing spec' do
-    subject { file('spec/routing/posts_routing_spec.rb') }
+    subject(:filename) { file('spec/routing/posts_routing_spec.rb') }
 
     describe 'with no flag' do
       before do
         run_generator %w[posts seek and destroy]
       end
-      it { is_expected.not_to exist }
+
+      it 'skips the file' do
+        expect(File.exist?(filename)).to be false
+      end
     end
 
     describe 'with --routing-specs  flag' do
@@ -137,17 +169,22 @@
         before do
           run_generator %w[posts --routing-specs]
         end
-        it { is_expected.not_to exist }
+
+        it 'skips the file' do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'with action parameter' do
         before { run_generator %w[posts seek --routing-specs] }
 
-        it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/^RSpec.describe 'PostsController', #{type_metatag(:routing)}/) }
-        it { is_expected.to contain(/describe 'routing'/) }
-        it { is_expected.to contain(/it 'routes to #seek'/) }
-        it { is_expected.to contain(/expect\(get: "\/posts\/seek"\).to route_to\("posts#seek"\)/) }
+        it 'includes the standard boilerplate' do
+          expect(filename).to contain(/require 'rails_helper'/)
+                                .and(contain(/^RSpec.describe 'PostsController', #{type_metatag(:routing)}/))
+                                .and(contain(/describe 'routing'/))
+                                .and(contain(/it 'routes to #seek'/))
+                                .and(contain(/expect\(get: "\/posts\/seek"\).to route_to\("posts#seek"\)/))
+        end
       end
     end
 
@@ -155,15 +192,18 @@
       before do
         run_generator %w[posts seek and destroy --no-routing_specs]
       end
-      it { is_expected.not_to exist }
+
+      it 'skips the file' do
+        expect(File.exist?(filename)).to be false
+      end
     end
   end
 
   describe 'controller specs' do
-    subject { file('spec/controllers/posts_controller_spec.rb') }
+    subject(:filename) { file('spec/controllers/posts_controller_spec.rb') }
 
-    describe 'are not generated' do
-      it { is_expected.not_to exist }
+    it 'are not generated' do
+      expect(File.exist?(filename)).to be false
     end
 
     describe 'with --controller-specs flag' do
@@ -172,9 +212,10 @@
       end
 
       describe 'the spec' do
-        it { is_expected.to exist }
-        it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/^RSpec.describe PostsController, #{type_metatag(:controller)}/) }
+        it 'includes the standard boilerplate' do
+          expect(filename).to contain(/require 'rails_helper'/)
+                               .and(contain(/^RSpec.describe PostsController, #{type_metatag(:controller)}/))
+        end
       end
     end
 
@@ -182,7 +223,10 @@
       before do
         run_generator %w[posts --no-controller-specs]
       end
-      it { is_expected.not_to exist }
+
+      it 'are skipped' do
+        expect(File.exist?(filename)).to be false
+      end
     end
   end
 end
diff --git a/spec/generators/rspec/feature/feature_generator_spec.rb b/spec/generators/rspec/feature/feature_generator_spec.rb
index 352bf76179..7149c1e1b8 100644
--- a/spec/generators/rspec/feature/feature_generator_spec.rb
+++ b/spec/generators/rspec/feature/feature_generator_spec.rb
@@ -10,16 +10,14 @@
       before do
         run_generator %w[posts]
       end
+
       describe 'the spec' do
         subject(:feature_spec) { file('spec/features/posts_spec.rb') }
-        it "exists" do
-          expect(feature_spec).to exist
-        end
-        it "contains 'rails_helper'" do
-          expect(feature_spec).to contain(/require 'rails_helper'/)
-        end
-        it "contains the feature" do
-          expect(feature_spec).to contain(/^RSpec.feature "Posts", #{type_metatag(:feature)}/)
+
+        it 'includes the standard boilerplate' do
+          expect(
+            feature_spec
+          ).to contain(/require 'rails_helper'/).and(contain(/^RSpec.feature "Posts", #{type_metatag(:feature)}/))
         end
       end
     end
@@ -28,12 +26,11 @@
       before do
         run_generator %w[folder/posts]
       end
+
       describe 'the spec' do
         subject(:feature_spec) { file('spec/features/folder/posts_spec.rb') }
-        it "exists" do
-          expect(feature_spec).to exist
-        end
-        it "contains the feature" do
+
+        it 'includes the standard boilerplate' do
           expect(feature_spec).to contain(/^RSpec.feature "Folder::Posts", #{type_metatag(:feature)}/)
         end
       end
@@ -43,11 +40,10 @@
       before do
         run_generator %w[posts --singularize]
       end
+
       describe 'the spec' do
         subject(:feature_spec) { file('spec/features/post_spec.rb') }
-        it "exists with the appropriate filename" do
-          expect(feature_spec).to exist
-        end
+
         it "contains the singularized feature" do
           expect(feature_spec).to contain(/^RSpec.feature "Post", #{type_metatag(:feature)}/)
         end
@@ -58,10 +54,12 @@
       before do
         run_generator %w[posts --no-feature-specs]
       end
+
       describe "the spec" do
         subject(:feature_spec) { file('spec/features/posts_spec.rb') }
+
         it "does not exist" do
-          expect(feature_spec).to_not exist
+          expect(File.exist?(feature_spec)).to be false
         end
       end
     end
diff --git a/spec/generators/rspec/generator/generator_generator_spec.rb b/spec/generators/rspec/generator/generator_generator_spec.rb
index 2d416e0bba..090fc00fdb 100644
--- a/spec/generators/rspec/generator/generator_generator_spec.rb
+++ b/spec/generators/rspec/generator/generator_generator_spec.rb
@@ -9,14 +9,9 @@
     before do
       run_generator %w[posts]
     end
-    it "creates the spec file by default" do
-      expect(generator_spec).to exist
-    end
-    it "contains 'rails_helper in the spec file'" do
-      expect(generator_spec).to contain(/require 'rails_helper'/)
-    end
-    it "includes the generator type in the metadata" do
-      expect(generator_spec).to contain(/^RSpec.describe "Posts", #{type_metatag(:generator)}/)
+
+    it "include the standard boilerplate" do
+      expect(generator_spec).to contain(/require 'rails_helper'/).and(contain(/^RSpec.describe "PostsGenerator", #{type_metatag(:generator)}/))
     end
   end
 end
diff --git a/spec/generators/rspec/helper/helper_generator_spec.rb b/spec/generators/rspec/helper/helper_generator_spec.rb
index c628891c6d..271bb35b7b 100644
--- a/spec/generators/rspec/helper/helper_generator_spec.rb
+++ b/spec/generators/rspec/helper/helper_generator_spec.rb
@@ -5,22 +5,25 @@
 RSpec.describe Rspec::Generators::HelperGenerator, type: :generator do
   setup_default_destination
 
-  subject { file('spec/helpers/posts_helper_spec.rb') }
+  subject(:helper_spec) { file('spec/helpers/posts_helper_spec.rb') }
+
   describe 'generated by default' do
     before do
       run_generator %w[posts]
     end
 
-    describe 'the spec' do
-      it { is_expected.to exist }
-      it { is_expected.to contain(/require 'rails_helper'/) }
-      it { is_expected.to contain(/^RSpec.describe PostsHelper, #{type_metatag(:helper)}/) }
+    it 'includes the standard boilerplate' do
+      expect(helper_spec).to contain(/require 'rails_helper'/).and(contain(/^RSpec.describe PostsHelper, #{type_metatag(:helper)}/))
     end
   end
+
   describe 'skipped with a flag' do
     before do
       run_generator %w[posts --no-helper_specs]
     end
-    it { is_expected.not_to exist }
+
+    it 'does not create the helper spec' do
+      expect(File.exist?(helper_spec)).to be false
+    end
   end
 end
diff --git a/spec/generators/rspec/install/install_generator_spec.rb b/spec/generators/rspec/install/install_generator_spec.rb
index ec4a6db846..65b4244271 100644
--- a/spec/generators/rspec/install/install_generator_spec.rb
+++ b/spec/generators/rspec/install/install_generator_spec.rb
@@ -55,7 +55,7 @@ def filter_rails_from_backtrace
 
   it "generates .rspec" do
     run_generator
-    expect(file('.rspec')).to exist
+    expect(File.exist?(file('.rspec'))).to be true
   end
 
   it "generates spec/spec_helper.rb" do
diff --git a/spec/generators/rspec/job/job_generator_spec.rb b/spec/generators/rspec/job/job_generator_spec.rb
index 529fa91db3..98cb5ed5d0 100644
--- a/spec/generators/rspec/job/job_generator_spec.rb
+++ b/spec/generators/rspec/job/job_generator_spec.rb
@@ -8,23 +8,22 @@
   describe 'the generated files' do
     before { run_generator [file_name] }
 
+    subject(:job_spec) { file('spec/jobs/user_job_spec.rb') }
+
     context 'with file_name without job as suffix' do
       let(:file_name) { 'user' }
-      subject { file('spec/jobs/user_job_spec.rb') }
 
-      it { is_expected.to exist }
-      it { is_expected.to contain(/require 'rails_helper'/) }
-      it { is_expected.to contain(/describe UserJob, #{type_metatag(:job)}/) }
+      it 'creates the standard boiler plate' do
+        expect(job_spec).to contain(/require 'rails_helper'/).and(contain(/describe UserJob, #{type_metatag(:job)}/))
+      end
     end
 
     context 'with file_name with job as suffix' do
       let(:file_name) { 'user_job' }
 
-      subject { file('spec/jobs/user_job_spec.rb') }
-
-      it { is_expected.to exist }
-      it { is_expected.to contain(/require 'rails_helper'/) }
-      it { is_expected.to contain(/describe UserJob, #{type_metatag(:job)}/) }
+      it 'creates the standard boiler plate' do
+        expect(job_spec).to contain(/require 'rails_helper'/).and(contain(/describe UserJob, #{type_metatag(:job)}/))
+      end
     end
   end
 end
diff --git a/spec/generators/rspec/mailbox/mailbox_generator_spec.rb b/spec/generators/rspec/mailbox/mailbox_generator_spec.rb
index cee01ad39f..74e72d37fa 100644
--- a/spec/generators/rspec/mailbox/mailbox_generator_spec.rb
+++ b/spec/generators/rspec/mailbox/mailbox_generator_spec.rb
@@ -8,10 +8,12 @@
   describe 'the generated files' do
     before { run_generator %w[forwards] }
 
-    subject { file('spec/mailboxes/forwards_mailbox_spec.rb') }
+    subject(:mailbox_spec) { file('spec/mailboxes/forwards_mailbox_spec.rb') }
 
-    it { is_expected.to exist }
-    it { is_expected.to contain(/require 'rails_helper'/) }
-    it { is_expected.to contain(/describe ForwardsMailbox, #{type_metatag(:mailbox)}/) }
+    it 'generates the file' do
+      expect(
+        mailbox_spec
+      ).to contain(/require 'rails_helper'/).and contain(/describe ForwardsMailbox, #{type_metatag(:mailbox)}/)
+    end
   end
 end
diff --git a/spec/generators/rspec/mailer/mailer_generator_spec.rb b/spec/generators/rspec/mailer/mailer_generator_spec.rb
index 7c15e6184f..4ac7d3ec4c 100644
--- a/spec/generators/rspec/mailer/mailer_generator_spec.rb
+++ b/spec/generators/rspec/mailer/mailer_generator_spec.rb
@@ -6,25 +6,36 @@
   setup_default_destination
 
   describe 'mailer spec' do
-    subject { file('spec/mailers/posts_spec.rb') }
+    subject(:filename) { file('spec/mailers/posts_mailer_spec.rb') }
+
     describe 'a spec is created for each action' do
       before do
         run_generator %w[posts index show]
       end
-      it { is_expected.to exist }
-      it { is_expected.to contain(/require "rails_helper"/) }
-      # Rails 5+ automatically appends Mailer to the provided constant so we do too
-      it { is_expected.to contain(/^RSpec.describe PostsMailer, #{type_metatag(:mailer)}/) }
-      it { is_expected.to contain(/describe "index" do/) }
-      it { is_expected.to contain(/describe "show" do/) }
+
+      it "includes the standard boilerplate" do
+        # Rails 5+ automatically appends Mailer to the provided constant so we do too
+        expect(
+          filename
+        ).to(
+          contain(/require "rails_helper"/)
+            .and(contain(/^RSpec.describe PostsMailer, #{type_metatag(:mailer)}/))
+            .and(contain(/describe "index" do/))
+            .and(contain(/describe "show" do/))
+        )
+      end
     end
+
     describe 'creates placeholder when no actions specified' do
       before do
         run_generator %w[posts]
       end
-      it { is_expected.to exist }
-      it { is_expected.to contain(/require "rails_helper"/) }
-      it { is_expected.to contain(/pending "add some examples to \(or delete\)/) }
+
+      it "includes the standard boilerplate" do
+        expect(
+          filename
+        ).to contain(/require "rails_helper"/).and(contain(/pending "add some examples to \(or delete\)/))
+      end
     end
   end
 
@@ -32,28 +43,41 @@
     before do
       run_generator %w[posts index show]
     end
+
     describe 'index' do
-      subject { file('spec/fixtures/posts/index') }
-      it { is_expected.to exist }
-      it { is_expected.to contain(/Posts#index/) }
+      subject(:filename) { file('spec/fixtures/posts/index') }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain(/Posts#index/)
+      end
     end
+
     describe 'show' do
-      subject { file('spec/fixtures/posts/show') }
-      it { is_expected.to exist }
-      it { is_expected.to contain(/Posts#show/) }
+      subject(:filename) { file('spec/fixtures/posts/show') }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain(/Posts#show/)
+      end
     end
   end
 
   describe 'a preview is generated for each action', skip: !RSpec::Rails::FeatureCheck.has_action_mailer_preview? do
-    subject { file('spec/mailers/previews/posts_preview.rb') }
     before do
       run_generator %w[posts index show]
     end
-    it { is_expected.to exist }
-    it { is_expected.to contain(/class PostsPreview < ActionMailer::Preview/) }
-    it { is_expected.to contain(/def index/) }
-    it { is_expected.to contain(/PostsMailer.index/) }
-    it { is_expected.to contain(/def show/) }
-    it { is_expected.to contain(/PostsMailer.show/) }
+
+    subject(:filename) { file('spec/mailers/previews/posts_mailer_preview.rb') }
+
+    it "includes the standard boilerplate" do
+      expect(
+        filename
+      ).to(
+        contain(/class PostsMailerPreview < ActionMailer::Preview/)
+          .and(contain(/def index/))
+          .and(contain(/PostsMailer.index/))
+          .and(contain(/def show/))
+          .and(contain(/PostsMailer.show/))
+      )
+    end
   end
 end
diff --git a/spec/generators/rspec/model/model_generator_spec.rb b/spec/generators/rspec/model/model_generator_spec.rb
index 521170774a..5aacf721c4 100644
--- a/spec/generators/rspec/model/model_generator_spec.rb
+++ b/spec/generators/rspec/model/model_generator_spec.rb
@@ -22,9 +22,9 @@
       end
 
       describe 'the fixtures' do
-        subject { file('spec/fixtures/posts.yml') }
-
-        it { is_expected.not_to exist }
+        it "will skip the file" do
+          expect(File.exist?(file('spec/fixtures/posts.yml'))).to be false
+        end
       end
     end
   end
diff --git a/spec/generators/rspec/scaffold/scaffold_generator_spec.rb b/spec/generators/rspec/scaffold/scaffold_generator_spec.rb
index 4ca4c4f705..4e02682e3d 100644
--- a/spec/generators/rspec/scaffold/scaffold_generator_spec.rb
+++ b/spec/generators/rspec/scaffold/scaffold_generator_spec.rb
@@ -8,46 +8,70 @@
   setup_default_destination
 
   describe 'standard request specs' do
-    subject { file('spec/requests/posts_spec.rb') }
+    subject(:filename) { file('spec/requests/posts_spec.rb') }
 
     describe 'with no options' do
       before { run_generator %w[posts --request_specs] }
-      it { is_expected.to exist }
-      it { is_expected.to contain("require 'rails_helper'") }
-      it { is_expected.to contain(/^RSpec.describe "\/posts", #{type_metatag(:request)}/) }
-      it { is_expected.to contain('GET /new') }
-      it { is_expected.to contain(/"redirects to the created post"/) }
-      it { is_expected.to contain('get post_url(post)') }
-      it { is_expected.to contain('redirect_to(post_url(Post.last))') }
-      it { is_expected.to contain(/"redirects to the \w+ list"/) }
-
-      if ::Rails::VERSION::STRING >= '7.0.0'
-        it { is_expected.to contain(/renders a response with 422 status \(i.e. to display the 'new' template\)/) }
-        it { is_expected.to contain(/renders a response with 422 status \(i.e. to display the 'edit' template\)/) }
-      else
-        it { is_expected.to contain(/renders a successful response \(i.e. to display the 'new' template\)/) }
-        it { is_expected.to contain(/renders a successful response \(i.e. to display the 'edit' template\)/) }
+
+      it "includes the standard boilerplate" do
+        expect(
+          filename
+        ).to(
+          contain("require 'rails_helper'")
+            .and(contain(/^RSpec.describe "\/posts", #{type_metatag(:request)}/))
+            .and(contain('GET /new'))
+            .and(contain(/"redirects to the created post"/))
+            .and(contain('get post_url(post)'))
+            .and(contain('redirect_to(post_url(Post.last))'))
+            .and(contain(/"redirects to the \w+ list"/))
+        )
+
+        if ::Rails::VERSION::STRING >= '7.0.0'
+          expect(
+            filename
+          ).to(
+            contain(/renders a response with 422 status \(i.e. to display the 'new' template\)/)
+              .and(contain(/renders a response with 422 status \(i.e. to display the 'edit' template\)/))
+          )
+        else
+          expect(
+            filename
+          ).to(
+            contain(/renders a successful response \(i.e. to display the 'new' template\)/)
+              .and(contain(/renders a successful response \(i.e. to display the 'edit' template\)/))
+          )
+        end
       end
     end
 
     describe 'with --no-request_specs' do
       before { run_generator %w[posts --no-request_specs] }
-      it { is_expected.not_to exist }
+
+      it "is skipped" do
+        expect(File.exist?(filename)).to be false
+      end
     end
 
     describe 'with --api' do
       before { run_generator %w[posts --api] }
-      it { is_expected.to exist }
-      it { is_expected.to contain(/require 'rails_helper'/) }
-      it { is_expected.to contain(/^RSpec.describe "\/posts", #{type_metatag(:request)}/) }
-      it { is_expected.to contain('as: :json') }
-      it { is_expected.not_to contain('get new_posts_path') }
-      it { is_expected.not_to contain(/"redirects to\w+"/) }
-      it { is_expected.to contain('renders a JSON response with the new post') }
-      it { is_expected.to contain('renders a JSON response with errors for the new post') }
-      it { is_expected.not_to contain('get edit_posts_path') }
-      it { is_expected.to contain('renders a JSON response with the post') }
-      it { is_expected.to contain('renders a JSON response with errors for the post') }
+
+      it "includes the standard boilerplate" do
+        expect(
+          filename
+        ).to(
+          contain(/require 'rails_helper'/)
+            .and(contain(/^RSpec.describe "\/posts", #{type_metatag(:request)}/))
+            .and(contain('as: :json'))
+            .and(contain('renders a JSON response with the new post'))
+            .and(contain('renders a JSON response with errors for the new post'))
+            .and(contain('renders a JSON response with the post'))
+            .and(contain('renders a JSON response with errors for the post'))
+        )
+
+        expect(filename).not_to contain('get new_posts_path')
+        expect(filename).not_to contain(/"redirects to\w+"/)
+        expect(filename).not_to contain('get edit_posts_path')
+      end
     end
 
     describe 'in an engine' do
@@ -55,130 +79,168 @@
         in_sub_process do
           allow_any_instance_of(::Rails::Generators::NamedBase).to receive(:mountable_engine?).and_return(true)
           run_generator %w[posts --request_specs]
-          is_expected.to contain('Engine.routes.url_helpers')
+
+          expect(filename).to contain('Engine.routes.url_helpers')
         end
       end
     end
   end
 
   describe 'standard controller spec' do
-    subject { file('spec/controllers/posts_controller_spec.rb') }
+    subject(:filename) { file('spec/controllers/posts_controller_spec.rb') }
 
     describe 'with --controller_specs' do
       before { run_generator %w[posts --controller_specs] }
-      it { is_expected.to contain(/require 'rails_helper'/) }
-      it { is_expected.to contain(/^RSpec.describe PostsController, #{type_metatag(:controller)}/) }
-      it { is_expected.to contain(/GET #new/) }
-      it { is_expected.to contain(/"redirects to the created \w+"/) }
-      if ::Rails::VERSION::STRING >= '7.0.0'
-        it { is_expected.to contain(/renders a response with 422 status \(i.e. to display the 'new' template\)/) }
-      else
-        it { is_expected.to contain(/returns a success response \(i.e. to display the 'new' template\)/) }
-      end
-      it { is_expected.not_to contain(/"renders a JSON response with the new \w+"/) }
-      it { is_expected.not_to contain(/"renders a JSON response with errors for the new \w+"/) }
-
-      it { is_expected.to contain(/GET #edit/) }
-      it { is_expected.to contain(/"redirects to the \w+"/) }
-      if ::Rails::VERSION::STRING >= '7.0.0'
-        it { is_expected.to contain(/renders a response with 422 status \(i.e. to display the 'edit' template\)/) }
-      else
-        it { is_expected.to contain(/returns a success response \(i.e. to display the 'edit' template\)/) }
-      end
-      it { is_expected.not_to contain(/"renders a JSON response with the \w+"/) }
-      it { is_expected.not_to contain(/"renders a JSON response with errors for the \w+"/) }
-
-      it { is_expected.to contain(/"redirects to the \w+ list"/) }
+
+      it "includes the standard boilerplate" do
+        expect(
+          filename
+        ).to(
+          contain(/require 'rails_helper'/)
+            .and(contain(/^RSpec.describe PostsController, #{type_metatag(:controller)}/))
+            .and(contain(/GET #new/))
+            .and(contain(/"redirects to the created \w+"/))
+            .and(contain(/GET #edit/))
+            .and(contain(/"redirects to the \w+"/))
+            .and(contain(/"redirects to the \w+ list"/))
+        )
+
+        if ::Rails::VERSION::STRING >= '7.0.0'
+          expect(filename).to contain(/renders a response with 422 status \(i.e. to display the 'new' template\)/)
+                                .and(contain(/renders a response with 422 status \(i.e. to display the 'edit' template\)/))
+        else
+          expect(filename).to contain(/returns a success response \(i.e. to display the 'new' template\)/)
+                               .and(contain(/returns a success response \(i.e. to display the 'edit' template\)/))
+        end
+
+        expect(filename).not_to contain(/"renders a JSON response with the new \w+"/)
+        expect(filename).not_to contain(/"renders a JSON response with errors for the new \w+"/)
+        expect(filename).not_to contain(/"renders a JSON response with the \w+"/)
+        expect(filename).not_to contain(/"renders a JSON response with errors for the \w+"/)
+      end
     end
 
     describe 'with no options' do
       before { run_generator %w[posts] }
-      it { is_expected.not_to exist }
+
+      it 'skips the file' do
+        expect(File.exist?(filename)).to be false
+      end
     end
 
     describe 'with --api' do
       before { run_generator %w[posts --controller_specs --api] }
-      it { is_expected.to contain(/require 'rails_helper'/) }
-      it { is_expected.to contain(/^RSpec.describe PostsController, #{type_metatag(:controller)}/) }
-      it { is_expected.not_to contain(/GET #new/) }
-      it { is_expected.not_to contain(/"redirects to the created \w+"/) }
-      it { is_expected.not_to contain(/display the 'new' template/) }
-      it { is_expected.to contain(/"renders a JSON response with the new \w+"/) }
-      it { is_expected.to contain(/"renders a JSON response with errors for the new \w+"/) }
-      it { is_expected.not_to contain(/GET #edit/) }
-      it { is_expected.not_to contain(/"redirects to the \w+"/) }
-      it { is_expected.not_to contain(/display the 'edit' template/) }
-      it { is_expected.to contain(/"renders a JSON response with the \w+"/) }
-      it { is_expected.to contain(/"renders a JSON response with errors for the \w+"/) }
-
-      it { is_expected.not_to contain(/"redirects to the \w+ list"/) }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain(/require 'rails_helper'/)
+                             .and(contain(/^RSpec.describe PostsController, #{type_metatag(:controller)}/))
+                             .and(contain(/"renders a JSON response with the new \w+"/))
+                             .and(contain(/"renders a JSON response with errors for the new \w+"/))
+                             .and(contain(/"renders a JSON response with the \w+"/))
+                             .and(contain(/"renders a JSON response with errors for the \w+"/))
+
+        expect(filename).not_to  contain(/GET #new/)
+        expect(filename).not_to  contain(/"redirects to the created \w+"/)
+        expect(filename).not_to  contain(/display the 'new' template/)
+        expect(filename).not_to  contain(/GET #edit/)
+        expect(filename).not_to  contain(/"redirects to the \w+"/)
+        expect(filename).not_to  contain(/display the 'edit' template/)
+        expect(filename).not_to  contain(/"redirects to the \w+ list"/)
+      end
     end
   end
 
   describe 'namespaced request spec' do
-    subject { file('spec/requests/admin/posts_spec.rb') }
+    subject(:filename) { file('spec/requests/admin/posts_spec.rb') }
 
     describe 'with default options' do
       before { run_generator %w[admin/posts] }
-      it { is_expected.to exist }
-      it { is_expected.to contain(/^RSpec.describe "\/admin\/posts", #{type_metatag(:request)}/) }
-      it { is_expected.to contain('post admin_posts_url, params: { admin_post: valid_attributes }') }
-      it { is_expected.to contain('admin_post_url(post)') }
-      it { is_expected.to contain('Admin::Post.create') }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain(/^RSpec.describe "\/admin\/posts", #{type_metatag(:request)}/)
+                           .and(contain('post admin_posts_url, params: { admin_post: valid_attributes }'))
+                           .and(contain('admin_post_url(post)'))
+                           .and(contain('Admin::Post.create'))
+      end
     end
 
     describe 'with --model-name' do
       before { run_generator %w[admin/posts --model-name=post] }
-      it { is_expected.to contain('post admin_posts_url, params: { post: valid_attributes }') }
-      it { is_expected.not_to contain('params: { admin_post: valid_attributes }') }
-      it { is_expected.to contain(' Post.create') }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain('post admin_posts_url, params: { post: valid_attributes }')
+                             .and(contain(' Post.create'))
+
+        expect(filename).not_to contain('params: { admin_post: valid_attributes }')
+      end
     end
 
     context 'with --api' do
       describe 'with default options' do
         before { run_generator %w[admin/posts --api] }
-        it { is_expected.to contain('params: { admin_post: valid_attributes }') }
-        it { is_expected.to contain('Admin::Post.create') }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain('params: { admin_post: valid_attributes }')
+                               .and(contain('Admin::Post.create'))
+        end
       end
 
       describe 'with --model-name' do
         before { run_generator %w[admin/posts --api --model-name=post] }
-        it { is_expected.to contain('params: { post: valid_attributes }') }
-        it { is_expected.not_to contain('params: { admin_post: valid_attributes }') }
-        it { is_expected.to contain(' Post.create') }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain('params: { post: valid_attributes }')
+                                .and(contain(' Post.create'))
+
+          expect(filename).not_to contain('params: { admin_post: valid_attributes }')
+        end
       end
     end
   end
 
   describe 'namespaced controller spec' do
-    subject { file('spec/controllers/admin/posts_controller_spec.rb') }
+    subject(:filename) { file('spec/controllers/admin/posts_controller_spec.rb') }
 
     describe 'with default options' do
       before { run_generator %w[admin/posts --controller_specs] }
-      it { is_expected.to contain(/^RSpec.describe Admin::PostsController, #{type_metatag(:controller)}/) }
-      it { is_expected.to contain('post :create, params: {admin_post: valid_attributes}') }
-      it { is_expected.to contain('Admin::Post.create') }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain(/^RSpec.describe Admin::PostsController, #{type_metatag(:controller)}/)
+                             .and(contain('post :create, params: {admin_post: valid_attributes}'))
+                             .and(contain('Admin::Post.create'))
+      end
     end
 
     describe 'with --model-name' do
       before { run_generator %w[admin/posts --model-name=post --controller_specs] }
-      it { is_expected.to contain('post :create, params: {post: valid_attributes}') }
-      it { is_expected.not_to contain('params: {admin_post: valid_attributes}') }
-      it { is_expected.to contain(' Post.create') }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain('post :create, params: {post: valid_attributes}')
+                              .and(contain(' Post.create'))
+
+        expect(filename).not_to contain('params: {admin_post: valid_attributes}')
+      end
     end
 
     context 'with --api' do
       describe 'with default options' do
         before { run_generator %w[admin/posts --api --controller_specs] }
-        it { is_expected.to contain('post :create, params: {admin_post: valid_attributes}') }
-        it { is_expected.to contain('Admin::Post.create') }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain('post :create, params: {admin_post: valid_attributes}')
+                                .and(contain('Admin::Post.create'))
+        end
       end
 
       describe 'with --model-name' do
         before { run_generator %w[admin/posts --api --model-name=post --controller_specs] }
-        it { is_expected.to contain('post :create, params: {post: valid_attributes}') }
-        it { is_expected.not_to contain('params: {admin_post: valid_attributes}') }
-        it { is_expected.to contain(' Post.create') }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain('post :create, params: {post: valid_attributes}')
+                               .and(contain(' Post.create'))
+
+          expect(filename).not_to contain('params: {admin_post: valid_attributes}')
+        end
       end
     end
   end
@@ -188,70 +250,95 @@
       before { run_generator %w[posts] }
 
       describe 'edit' do
-        subject { file("spec/views/posts/edit.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/^RSpec.describe "(.*)\/edit", #{type_metatag(:view)}/) }
-        it { is_expected.to contain(/assign\(:post, post\)/) }
-        it { is_expected.to contain(/it "renders the edit (.*) form"/) }
+        subject(:filename) { file("spec/views/posts/edit.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/require 'rails_helper'/)
+                             .and(contain(/^RSpec.describe "(.*)\/edit", #{type_metatag(:view)}/))
+                             .and(contain(/assign\(:post, post\)/))
+                             .and(contain(/it "renders the edit (.*) form"/))
+        end
       end
 
       describe 'index' do
-        subject { file("spec/views/posts/index.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/^RSpec.describe "(.*)\/index", #{type_metatag(:view)}/) }
-        it { is_expected.to contain(/assign\(:posts, /) }
-        it { is_expected.to contain(/it "renders a list of (.*)"/) }
+        subject(:filename) { file("spec/views/posts/index.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/require 'rails_helper'/)
+                             .and(contain(/^RSpec.describe "(.*)\/index", #{type_metatag(:view)}/))
+                             .and(contain(/assign\(:posts, /))
+                             .and(contain(/it "renders a list of (.*)"/))
+
+          if ::Rails::VERSION::STRING >= '7.0.0'
+            expect(filename).to contain(/'div>p'/)
+          else
+            expect(filename).to contain(/'tr>td'/)
+          end
+        end
       end
 
       describe 'new' do
-        subject { file("spec/views/posts/new.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/^RSpec.describe "(.*)\/new", #{type_metatag(:view)}/) }
-        it { is_expected.to contain(/assign\(:post, /) }
-        it { is_expected.to contain(/it "renders new (.*) form"/) }
+        subject(:filename) { file("spec/views/posts/new.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/require 'rails_helper'/)
+                             .and(contain(/^RSpec.describe "(.*)\/new", #{type_metatag(:view)}/))
+                             .and(contain(/assign\(:post, /))
+                             .and(contain(/it "renders new (.*) form"/))
+        end
       end
 
       describe 'show' do
-        subject { file("spec/views/posts/show.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/require 'rails_helper'/) }
-        it { is_expected.to contain(/^RSpec.describe "(.*)\/show", #{type_metatag(:view)}/) }
-        it { is_expected.to contain(/assign\(:post, /) }
-        it { is_expected.to contain(/it "renders attributes in <p>"/) }
+        subject(:filename) { file("spec/views/posts/show.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/require 'rails_helper'/)
+                             .and(contain(/^RSpec.describe "(.*)\/show", #{type_metatag(:view)}/))
+                             .and(contain(/assign\(:post, /))
+                             .and(contain(/it "renders attributes in <p>"/))
+        end
       end
     end
 
     describe 'with multiple integer attributes index' do
       before { run_generator %w[posts upvotes:integer downvotes:integer] }
-      subject { file("spec/views/posts/index.html.erb_spec.rb") }
-      it { is_expected.to exist }
-      it { is_expected.to contain('assert_select cell_selector, text: Regexp.new(2.to_s), count: 2') }
-      it { is_expected.to contain('assert_select cell_selector, text: Regexp.new(3.to_s), count: 2') }
+      subject(:filename) { file("spec/views/posts/index.html.erb_spec.rb") }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain('assert_select cell_selector, text: Regexp.new(2.to_s), count: 2')
+                           .and(contain('assert_select cell_selector, text: Regexp.new(3.to_s), count: 2'))
+      end
     end
 
     describe 'with multiple float attributes index' do
       before { run_generator %w[posts upvotes:float downvotes:float] }
-      subject { file("spec/views/posts/index.html.erb_spec.rb") }
-      it { is_expected.to exist }
-      it { is_expected.to contain('assert_select cell_selector, text: Regexp.new(2.5.to_s), count: 2') }
-      it { is_expected.to contain('assert_select cell_selector, text: Regexp.new(3.5.to_s), count: 2') }
+      subject(:filename) { file("spec/views/posts/index.html.erb_spec.rb") }
+
+      it "includes the standard boilerplate" do
+        expect(filename).to contain('assert_select cell_selector, text: Regexp.new(2.5.to_s), count: 2')
+                           .and(contain('assert_select cell_selector, text: Regexp.new(3.5.to_s), count: 2'))
+      end
     end
 
     describe 'with reference attribute' do
       before { run_generator %w[posts title:string author:references] }
+
       describe 'edit' do
-        subject { file("spec/views/posts/edit.html.erb_spec.rb") }
-        it { is_expected.to contain(/assert_select "input\[name=\?\]", "post\[author_id\]/) }
-        it { is_expected.to contain(/assert_select "input\[name=\?\]", "post\[title\]/) }
+        subject(:filename) { file("spec/views/posts/edit.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assert_select "input\[name=\?\]", "post\[author_id\]/)
+                               .and(contain(/assert_select "input\[name=\?\]", "post\[title\]/))
+        end
       end
 
       describe 'new' do
-        subject { file("spec/views/posts/new.html.erb_spec.rb") }
-        it { is_expected.to contain(/assert_select "input\[name=\?\]", "post\[author_id\]"/) }
-        it { is_expected.to contain(/assert_select "input\[name=\?\]", "post\[title\]/) }
+        subject(:filename) { file("spec/views/posts/new.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assert_select "input\[name=\?\]", "post\[author_id\]"/)
+                                .and(contain(/assert_select "input\[name=\?\]", "post\[title\]/))
+        end
       end
     end
 
@@ -259,27 +346,35 @@
       before { run_generator %w[admin/posts] }
 
       describe 'edit' do
-        subject { file("spec/views/admin/posts/edit.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/assign\(:admin_post, admin_post\)/) }
+        subject(:filename) { file("spec/views/admin/posts/edit.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assign\(:admin_post, admin_post\)/)
+        end
       end
 
       describe 'index' do
-        subject { file("spec/views/admin/posts/index.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/assign\(:admin_posts, /) }
+        subject(:filename) { file("spec/views/admin/posts/index.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assign\(:admin_posts, /)
+        end
       end
 
       describe 'new' do
-        subject { file("spec/views/admin/posts/new.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/assign\(:admin_post, /) }
+        subject(:filename) { file("spec/views/admin/posts/new.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assign\(:admin_post, /)
+        end
       end
 
       describe 'show' do
-        subject { file("spec/views/admin/posts/show.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/assign\(:admin_post, /) }
+        subject(:filename) { file("spec/views/admin/posts/show.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assign\(:admin_post, /)
+        end
       end
     end
 
@@ -287,50 +382,70 @@
       before { run_generator %w[admin/posts --model-name=Post] }
 
       describe 'edit' do
-        subject { file("spec/views/admin/posts/edit.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/assign\(:post, post\)/) }
+        subject(:filename) { file("spec/views/admin/posts/edit.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assign\(:post, post\)/)
+        end
       end
 
       describe 'index' do
-        subject { file("spec/views/admin/posts/index.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/assign\(:posts, /) }
+        subject(:filename) { file("spec/views/admin/posts/index.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assign\(:posts, /)
+        end
       end
 
       describe 'new' do
-        subject { file("spec/views/admin/posts/new.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/assign\(:post, /) }
+        subject(:filename) { file("spec/views/admin/posts/new.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assign\(:post, /)
+        end
       end
 
       describe 'show' do
-        subject { file("spec/views/admin/posts/show.html.erb_spec.rb") }
-        it { is_expected.to exist }
-        it { is_expected.to contain(/assign\(:post, /) }
+        subject(:filename) { file("spec/views/admin/posts/show.html.erb_spec.rb") }
+
+        it "includes the standard boilerplate" do
+          expect(filename).to contain(/assign\(:post, /)
+        end
       end
     end
 
     describe 'with --no-template-engine' do
       before { run_generator %w[posts --no-template-engine] }
       describe 'edit' do
-        subject { file("spec/views/posts/edit.html._spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/edit.html._spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'index' do
-        subject { file("spec/views/posts/index.html._spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/index.html._spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'new' do
-        subject { file("spec/views/posts/new.html._spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/new.html._spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'show' do
-        subject { file("spec/views/posts/show.html._spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/show.html._spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
     end
 
@@ -338,23 +453,35 @@
       before { run_generator %w[posts --api] }
 
       describe 'edit' do
-        subject { file("spec/views/posts/edit.html.erb_spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/edit.html.erb_spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'index' do
-        subject { file("spec/views/posts/index.html.erb_spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/index.html.erb_spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'new' do
-        subject { file("spec/views/posts/index.html.erb_spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/index.html.erb_spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'show' do
-        subject { file("spec/views/posts/index.html.erb_spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/index.html.erb_spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
     end
 
@@ -362,58 +489,82 @@
       before { run_generator %w[posts --no-view-specs] }
 
       describe 'edit' do
-        subject { file("spec/views/posts/edit.html.erb_spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/edit.html.erb_spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'index' do
-        subject { file("spec/views/posts/index.html.erb_spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/index.html.erb_spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'new' do
-        subject { file("spec/views/posts/new.html.erb_spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/new.html.erb_spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
 
       describe 'show' do
-        subject { file("spec/views/posts/show.html.erb_spec.rb") }
-        it { is_expected.not_to exist }
+        subject(:filename) { file("spec/views/posts/show.html.erb_spec.rb") }
+
+        it "skips the file" do
+          expect(File.exist?(filename)).to be false
+        end
       end
     end
   end
 
   describe 'routing spec' do
-    subject { file('spec/routing/posts_routing_spec.rb') }
+    subject(:filename) { file('spec/routing/posts_routing_spec.rb') }
 
     describe 'with default options' do
       before { run_generator %w[posts] }
-      it { is_expected.to contain(/require "rails_helper"/) }
-      it { is_expected.to contain(/^RSpec.describe PostsController, #{type_metatag(:routing)}/) }
-      it { is_expected.to contain(/describe "routing"/) }
-      it { is_expected.to contain(/routes to #new/) }
-      it { is_expected.to contain(/routes to #edit/) }
-      it { is_expected.to contain('route_to("posts#new")') }
+
+      it 'includes the standard boilerplate' do
+        expect(filename).to contain(/require "rails_helper"/)
+                             .and(contain(/^RSpec.describe PostsController, #{type_metatag(:routing)}/))
+                             .and(contain(/describe "routing"/))
+                             .and(contain(/routes to #new/))
+                             .and(contain(/routes to #edit/))
+                             .and(contain('route_to("posts#new")'))
+      end
     end
 
     describe 'with --no-routing-specs' do
       before { run_generator %w[posts --no-routing_specs] }
-      it { is_expected.not_to exist }
+
+      it "skips the file" do
+        expect(File.exist?(filename)).to be false
+      end
     end
 
     describe 'with --api' do
       before { run_generator %w[posts --api] }
-      it { is_expected.not_to contain(/routes to #new/) }
-      it { is_expected.not_to contain(/routes to #edit/) }
+
+      it 'skips the right content' do
+        expect(filename).not_to contain(/routes to #new/)
+        expect(filename).not_to contain(/routes to #edit/)
+      end
     end
 
     context 'with a namespaced name' do
-      subject { file('spec/routing/api/v1/posts_routing_spec.rb') }
+      subject(:filename) { file('spec/routing/api/v1/posts_routing_spec.rb') }
 
       describe 'with default options' do
         before { run_generator %w[api/v1/posts] }
-        it { is_expected.to contain(/^RSpec.describe Api::V1::PostsController, #{type_metatag(:routing)}/) }
-        it { is_expected.to contain('route_to("api/v1/posts#new")') }
+
+        it 'includes the standard boilerplate' do
+          expect(filename).to contain(/^RSpec.describe Api::V1::PostsController, #{type_metatag(:routing)}/)
+                               .and(contain('route_to("api/v1/posts#new")'))
+        end
       end
     end
   end
diff --git a/spec/generators/rspec/system/system_generator_spec.rb b/spec/generators/rspec/system/system_generator_spec.rb
index 0d2fc35474..3aab0fb161 100644
--- a/spec/generators/rspec/system/system_generator_spec.rb
+++ b/spec/generators/rspec/system/system_generator_spec.rb
@@ -7,19 +7,15 @@
 
   describe "system specs" do
     subject(:system_spec) { file("spec/system/posts_spec.rb") }
+
     describe "are generated independently from the command line" do
       before do
         run_generator %w[posts]
       end
+
       describe "the spec" do
-        it "exists" do
-          expect(system_spec).to exist
-        end
-        it "contains 'rails_helper'" do
-          expect(system_spec).to contain(/require 'rails_helper'/)
-        end
-        it "contains the system" do
-          expect(system_spec).to contain(/^RSpec.describe "Posts", #{type_metatag(:system)}/)
+        it "contains the standard boilerplate" do
+          expect(system_spec).to contain(/require 'rails_helper'/).and(contain(/^RSpec.describe "Posts", #{type_metatag(:system)}/))
         end
       end
     end
@@ -28,9 +24,10 @@
       before do
         run_generator %w[posts --no-system-specs]
       end
+
       describe "the spec" do
         it "does not exist" do
-          expect(system_spec).to_not exist
+          expect(File.exist?(system_spec)).to be false
         end
       end
     end
diff --git a/spec/rspec/rails/configuration_spec.rb b/spec/rspec/rails/configuration_spec.rb
index 28948d2e09..b61b54cf3f 100644
--- a/spec/rspec/rails/configuration_spec.rb
+++ b/spec/rspec/rails/configuration_spec.rb
@@ -161,26 +161,52 @@ def in_inferring_type_from_location_environment
     include_examples "infers type from location", :feature, "spec/features"
   end
 
-  it "fixture support is included with metadata `:use_fixtures`" do
-    in_sub_process do
-      a_hash = an_instance_of(Hash)
-      if ::Rails::VERSION::STRING >= "7.1.0"
-        expect(RSpec).to receive(:deprecate).with("config.fixture_path = \"custom/path\"", a_hash)
-      end
-
+  if ::Rails::VERSION::STRING >= "7.2.0"
+    it "fixture support is included with metadata `:use_fixtures`" do
       RSpec.configuration.global_fixtures = [:foo]
-      RSpec.configuration.fixture_path = "custom/path"
+      RSpec.configuration.fixture_paths = ["custom/path"]
 
       group = RSpec.describe("Arbitrary Description", :use_fixtures)
 
-      expect(group).to respond_to(:fixture_path)
+      expect(group.fixture_paths).to eq(["custom/path"])
 
-      if ::Rails::VERSION::STRING >= "7.1.0"
-        with_isolated_stderr { expect(group.fixture_path).to eq("custom/path") }
-      else
-        expect(group.fixture_path).to eq("custom/path")
+      expect(group.new.respond_to?(:foo, true)).to be(true)
+    end
+  elsif ::Rails::VERSION::STRING >= "7.1.0"
+    it "fixture support is included with metadata `:use_fixtures`" do
+      in_sub_process do
+        a_hash = an_instance_of(Hash)
+        if ::Rails::VERSION::STRING >= "7.1.0"
+          expect(RSpec).to receive(:deprecate).with("config.fixture_path = \"custom/path\"", a_hash)
+        end
+
+        RSpec.configuration.global_fixtures = [:foo]
+        RSpec.configuration.fixture_path = "custom/path"
+
+        group = RSpec.describe("Arbitrary Description", :use_fixtures)
+
+        if ::Rails::VERSION::STRING <= "7.2.0"
+          expect(group).to respond_to(:fixture_path)
+        end
+
+        if ::Rails::VERSION::STRING >= "7.1.0"
+          with_isolated_stderr { expect(group.fixture_path).to eq("custom/path") }
+        else
+          expect(group.fixture_path).to eq("custom/path")
+        end
+
+        expect(group.new.respond_to?(:foo, true)).to be(true)
       end
+    end
+  else
+    it "fixture support is included with metadata `:use_fixtures`" do
+      RSpec.configuration.global_fixtures = [:foo]
+      RSpec.configuration.fixture_path = "custom/path"
 
+      group = RSpec.describe("Arbitrary Description", :use_fixtures)
+
+      expect(group).to respond_to(:fixture_path)
+      expect(group.fixture_path).to eq("custom/path")
       expect(group.new.respond_to?(:foo, true)).to be(true)
     end
   end
diff --git a/spec/rspec/rails/example/rails_example_group_spec.rb b/spec/rspec/rails/example/rails_example_group_spec.rb
index 7faac16468..7dbe137888 100644
--- a/spec/rspec/rails/example/rails_example_group_spec.rb
+++ b/spec/rspec/rails/example/rails_example_group_spec.rb
@@ -1,9 +1,7 @@
 module RSpec::Rails
   RSpec.describe RailsExampleGroup do
-    if ::Rails::VERSION::MAJOR >= 7
-      it 'supports tagged_logger' do
-        expect(described_class.private_instance_methods).to include(:tagged_logger)
-      end
+    it 'supports tagged_logger', if: ::Rails::VERSION::MAJOR >= 7 do
+      expect(described_class.private_instance_methods).to include(:tagged_logger)
     end
 
     it 'does not leak context between example groups', if: ::Rails::VERSION::MAJOR >= 7 do
@@ -32,5 +30,31 @@ module RSpec::Rails
 
       expect(results).to all be true
     end
+
+    it 'will not leak ActiveSupport::CurrentAttributes between examples', if: ::Rails::VERSION::MAJOR >= 7 do
+      group =
+        RSpec::Core::ExampleGroup.describe("A group", order: :defined) do
+          include RSpec::Rails::RailsExampleGroup
+
+          # rubocop:disable Lint/ConstantDefinitionInBlock
+          class CurrentSample < ActiveSupport::CurrentAttributes
+            attribute :request_id
+          end
+          # rubocop:enable Lint/ConstantDefinitionInBlock
+
+          it 'sets a current attribute' do
+            CurrentSample.request_id = '123'
+            expect(CurrentSample.request_id).to eq('123')
+          end
+
+          it 'does not leak current attributes' do
+            expect(CurrentSample.request_id).to eq(nil)
+          end
+        end
+
+      expect(
+        group.run(failure_reporter) ? true : failure_reporter.exceptions
+      ).to be true
+    end
   end
 end
diff --git a/spec/rspec/rails/example/view_example_group_spec.rb b/spec/rspec/rails/example/view_example_group_spec.rb
index 7f6629c7c6..7dd0b3fec3 100644
--- a/spec/rspec/rails/example/view_example_group_spec.rb
+++ b/spec/rspec/rails/example/view_example_group_spec.rb
@@ -187,7 +187,7 @@ def _default_file_to_render; end # Stub method
         Class.new do
           include ViewExampleGroup::ExampleMethods
           def controller
-            @controller ||= OpenStruct.new(params: nil)
+            @controller ||= Struct.new(:params).new(nil)
           end
         end.new
       end
diff --git a/spec/rspec/rails/fixture_support_spec.rb b/spec/rspec/rails/fixture_support_spec.rb
index f14a1dfa30..236c8df283 100644
--- a/spec/rspec/rails/fixture_support_spec.rb
+++ b/spec/rspec/rails/fixture_support_spec.rb
@@ -7,13 +7,19 @@ module RSpec::Rails
           include FixtureSupport
         end
 
-        # These are deprecated when Rails is 7.1.0 or above
-        expect(group).to respond_to(:fixture_path)
-        expect(group).to respond_to(:fixture_path=)
-
-        if ::Rails::VERSION::STRING >= "7.1.0"
+        if ::Rails::VERSION::STRING >= "7.2.0"
+          expect(group).to respond_to(:fixture_paths)
+          expect(group).to respond_to(:fixture_paths=)
+        elsif ::Rails::VERSION::STRING >= "7.1.0"
           expect(group).to respond_to(:fixture_paths)
           expect(group).to respond_to(:fixture_paths=)
+
+          # These are deprecated when Rails is 7.1.0 but still exist
+          expect(group).to respond_to(:fixture_path)
+          expect(group).to respond_to(:fixture_path=)
+        else
+          expect(group).to respond_to(:fixture_path)
+          expect(group).to respond_to(:fixture_path=)
         end
       end
     end
@@ -37,22 +43,47 @@ module RSpec::Rails
 
         expect_to_pass(group)
       end
+    end
 
-      def expect_to_pass(group)
-        result = group.run(failure_reporter)
-        failure_reporter.exceptions.map { |e| raise e }
-        expect(result).to be true
+    context "with use_transactional_tests set to false" do
+      it "does not wrap the test in a transaction" do
+        allow(RSpec.configuration).to receive(:use_transactional_fixtures) { true }
+        group = RSpec::Core::ExampleGroup.describe do
+          include FixtureSupport
+
+          self.use_transactional_tests = false
+
+          it "doesn't run in transaction" do
+            expect(ActiveRecord::Base.connection.transaction_open?).to eq(false)
+          end
+        end
+
+        expect_to_pass(group)
       end
     end
 
-    it "will allow #setup_fixture to run successfully" do
+    it "handles namespaced fixtures" do
       group = RSpec::Core::ExampleGroup.describe do
         include FixtureSupport
+        fixtures 'namespaced/model'
 
-        self.use_transactional_tests = false
+        it 'has the fixture' do
+          namespaced_model(:one)
+        end
+      end
+      if Rails.version.to_f >= 7.1
+        group.fixture_paths = [File.expand_path('../../support/fixtures', __dir__)]
+      else
+        group.fixture_path = File.expand_path('../../support/fixtures', __dir__)
       end
 
-      expect { group.new.setup_fixtures }.to_not raise_error
+      expect_to_pass(group)
+    end
+
+    def expect_to_pass(group)
+      result = group.run(failure_reporter)
+      failure_reporter.exceptions.map { |e| raise e }
+      expect(result).to be true
     end
   end
 end
diff --git a/spec/rspec/rails/matchers/have_http_status_spec.rb b/spec/rspec/rails/matchers/have_http_status_spec.rb
index 002c805be1..82333c74c7 100644
--- a/spec/rspec/rails/matchers/have_http_status_spec.rb
+++ b/spec/rspec/rails/matchers/have_http_status_spec.rb
@@ -16,6 +16,14 @@ def create_response(opts = {})
       end
     end
 
+    context "given a Rack::MockResponse" do
+      it "returns true for a response with the same code" do
+        response = ::Rack::MockResponse.new(code, {}, "")
+
+        expect(matcher.matches?(response)).to be(true)
+      end
+    end
+
     context "given an ActionDispatch::TestResponse" do
       it "returns true for a response with the same code" do
         response = ::ActionDispatch::TestResponse.new(code).tap { |x|
@@ -491,4 +499,10 @@ def create_response(opts = {})
       let(:code) { 555 }
     end
   end
+
+  context 'with deprecated rack status codes' do
+    it 'supports the original names' do
+      expect(create_response(status: 422)).to have_http_status(:unprocessable_entity)
+    end
+  end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0f020214b9..91fd92fa92 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -35,6 +35,11 @@ def self.run_all(reporter = nil)
   end
 end
 
+# This behaviour will become the default in Rails 8, for now it silences a deprecation
+if ActiveSupport.respond_to?(:to_time_preserves_timezone)
+  ActiveSupport.to_time_preserves_timezone = true
+end
+
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
diff --git a/spec/support/ar_classes.rb b/spec/support/ar_classes.rb
index 92f5bafa6d..ed1b0ad4de 100644
--- a/spec/support/ar_classes.rb
+++ b/spec/support/ar_classes.rb
@@ -5,13 +5,13 @@
 
 module Connections
   def self.extended(host)
+    fields =
+      { host.primary_key => "integer PRIMARY KEY AUTOINCREMENT" }
+
+    fields.merge!(host.connection_fields) if host.respond_to?(:connection_fields)
+
     host.connection.execute <<-EOSQL
-      CREATE TABLE #{host.table_name} (
-        #{host.primary_key} integer PRIMARY KEY AUTOINCREMENT,
-        associated_model_id integer,
-        mockable_model_id integer,
-        nonexistent_model_id integer
-      )
+      CREATE TABLE #{host.table_name} ( #{fields.map { |column, type| "#{column} #{type}"}.join(", ") })
     EOSQL
 
     host.reset_column_information
@@ -24,7 +24,11 @@ class NonActiveRecordModel
 end
 
 class MockableModel < ActiveRecord::Base
+  def self.connection_fields
+    { associated_model_id: :integer }
+  end
   extend Connections
+
   has_one :associated_model
 end
 
@@ -32,7 +36,11 @@ class SubMockableModel < MockableModel
 end
 
 class AssociatedModel < ActiveRecord::Base
+  def self.connection_fields
+    { mockable_model_id: :integer, nonexistent_model_id: :integer }
+  end
   extend Connections
+
   belongs_to :mockable_model
   belongs_to :nonexistent_model, class_name: "Other"
 end
@@ -40,5 +48,16 @@ class AssociatedModel < ActiveRecord::Base
 class AlternatePrimaryKeyModel < ActiveRecord::Base
   self.primary_key = :my_id
   extend Connections
+
   attr_accessor :my_id
 end
+
+module Namespaced
+  class Model < ActiveRecord::Base
+    def self.connection_fields
+      { name: :string }
+    end
+
+    extend Connections
+  end
+end
diff --git a/spec/support/fixtures/namespaced/model.yml b/spec/support/fixtures/namespaced/model.yml
new file mode 100644
index 0000000000..3ee3712015
--- /dev/null
+++ b/spec/support/fixtures/namespaced/model.yml
@@ -0,0 +1,2 @@
+one:
+  name: "Model #1"
diff --git a/spec/support/generators.rb b/spec/support/generators.rb
index f57dc2b885..3f87aec9ea 100644
--- a/spec/support/generators.rb
+++ b/spec/support/generators.rb
@@ -24,17 +24,19 @@ def self.included(klass)
           before { run_generator [name, '--fixture'] }
 
           describe 'the spec' do
-            subject { file("spec/models/#{name}_spec.rb") }
+            subject(:model_spec) { file("spec/models/#{name}_spec.rb") }
 
-            it { is_expected.to exist }
-            it { is_expected.to contain(/require 'rails_helper'/) }
-            it { is_expected.to contain(/^RSpec.describe #{class_name}, #{type_metatag(:model)}/) }
+            it 'contains the standard boilerplate' do
+              expect(model_spec).to contain(/require 'rails_helper'/).and(contain(/^RSpec.describe #{class_name}, #{type_metatag(:model)}/))
+            end
           end
 
           describe 'the fixtures' do
-            subject { file("spec/fixtures/#{name}.yml") }
+            subject(:filename) { file("spec/fixtures/#{name}.yml") }
 
-            it { is_expected.to contain(Regexp.new('# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html')) }
+            it 'contains the standard boilerplate' do
+              expect(filename).to contain(Regexp.new('# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html'))
+            end
           end
         end
 
@@ -47,7 +49,7 @@ def self.included(klass)
             subject(:request_spec) { file('spec/requests/posts_spec.rb') }
 
             it "does not create the request spec" do
-              expect(request_spec).not_to exist
+              expect(File.exist?(request_spec)).to be false
             end
           end
 
@@ -62,27 +64,11 @@ def self.included(klass)
               let(:name) { %w[posts] }
               let(:spec_file_name) { 'spec/requests/posts_spec.rb' }
 
-              it "creates the request spec" do
-                expect(request_spec).to exist
-              end
-
-              it "the generator requires 'rails_helper'" do
+              it 'contains the standard boilerplate' do
                 expect(request_spec).to contain(/require 'rails_helper'/)
-              end
-
-              it "the generator describes the provided NAME without monkey " \
-                 "patching setting the type to `:request`" do
-                   expect(request_spec).to contain(
-                     /^RSpec.describe "Posts", #{type_metatag(:request)}/
-                   )
-                 end
-
-              it "the generator includes a sample GET request" do
-                expect(request_spec).to contain(/describe "GET \/posts"/)
-              end
-
-              it "the generator sends the GET request to the index path" do
-                expect(request_spec).to contain(/get posts_index_path/)
+                                          .and(contain(/^RSpec.describe "Posts", #{type_metatag(:request)}/))
+                                          .and(contain(/describe "GET \/posts"/))
+                                          .and(contain(/get posts_index_path/))
               end
             end
 
@@ -90,27 +76,11 @@ def self.included(klass)
               let(:name) { %w[api/posts] }
               let(:spec_file_name) { 'spec/requests/api/posts_spec.rb' }
 
-              it "creates the request spec" do
-                expect(request_spec).to exist
-              end
-
-              it "the generator requires 'rails_helper'" do
+              it 'contains the standard boilerplate' do
                 expect(request_spec).to contain(/require 'rails_helper'/)
-              end
-
-              it "the generator describes the provided NAME without monkey " \
-                 "patching setting the type to `:request`" do
-                   expect(request_spec).to contain(
-                     /^RSpec.describe "Api::Posts", #{type_metatag(:request)}/
-                   )
-                 end
-
-              it "the generator includes a sample GET request" do
-                expect(request_spec).to contain(/describe "GET \/api\/posts"/)
-              end
-
-              it "the generator sends the GET request to the index path" do
-                expect(request_spec).to contain(/get api_posts_index_path\n/)
+                                          .and(contain(/^RSpec.describe "Api::Posts", #{type_metatag(:request)}/))
+                                          .and(contain(/describe "GET \/api\/posts"/))
+                                          .and(contain(/get api_posts_index_path\n/))
               end
             end
           end