rspec-rails 5.1.2 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be221e5df3386cb55e14f8047e02628bc11098596dcce06749701ac0b7497782
-  data.tar.gz: 56b12531541ff18599c13618ba2937859bb4cd860cc814b3350046ec4949e870
+  metadata.gz: b5ff6b0dc14db86b07e0cc46cd193329c85e21d15c9863ccbb5b73c54972daa6
+  data.tar.gz: c7bd505a3bfd16f881fb04b04e98ff7df9910d230eb17183fc68621a74d4b9d9
 SHA512:
-  metadata.gz: a1786502c478ab9de29fbd59ce16371178776a7283698ba048b203f62aa614fc6c28e4c72b5064595f4eacd2cf309443de8d0d6803ac604e9d11a641c6f86c4b
-  data.tar.gz: 5860654b1926c2f2cdd998d2b84ac075167f7107bd687b74dae5bb9e17d7e76ef6b0c96dd022ec7a9be5dc0fe008e845808187080e97b400bec18b35d1872e76
+  metadata.gz: 6abbc3617dd82480b86c99c5d9347c94f8ac62bb944cf4ce1a223bea60046d9108be76fc3045a2e5f8549ad9813f7e831882f9ddee31de9d4215f643ce8a6d43
+  data.tar.gz: 07b551b367df408eaaa847307a6abd28a566a6a17ee4b552dc99a8bad95794f262884dc6e34a4d5717146fa001f89f6060cd1784818ed29f11f5361753fa606d

data/Changelog.md

@@ -1,5 +1,101 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.1.1...5-1-maintenance)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.1...6-1-maintenance)
+
+### 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
+  the matching change to `ActiveRecord::TestFixtures`, previous singular
+  form is deprecated and will be removed in Rails 7.2. (Juan Gueçaimburu, #2673)
+* Add `send_email` matcher to match emails rather than specific jobs.
+  (Andrei Kaleshka, #2670)
+* When using `render` in view specs, `:locals` will now be merged into the
+  default implicit template, allowing `render locals: {...}` style calls.
+  (Jon Rowe, #2686)
+* Add support for `Rails.config.action_mailer.preview_paths` on Rails 7.1/
+  (Jon Rowe, #2706)
+
+### 6.0.4 / 2023-11-21
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.3...v6.0.4)
+
+Bug Fixes:
+
+* Fuzzy match `have_broadcasted_to` so that argument matchers can be used.
+  (Timothy Peraza, #2684)
+* Fix fixture warning during `:context` hooks on Rails `main`. (Jon Rowe, #2685)
+* Fix `stub_template` on Rails `main`. (Jon Rowe, #2685)
+* Fix variable name in scaffolded view specs when namespaced. (Taketo Takashima, #2694)
+* Prevent `take_failed_screenshot` producing an additional error through `metadata`
+  access. (Jon Rowe, #2704)
+* Use `ActiveSupport::ExecutionContext::TestHelper` on Rails 7+. (Jon Rowe, #2711)
+* Fix leak of templates stubbed with `stub_template` on Rails 7.1. (Jon Rowe, #2714)
+
+### 6.0.3 / 2023-05-31
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.2...v6.0.3)
+
+Bug Fixes:
+
+* Set `ActiveStorage::FixtureSet.file_fixture_path` when including file fixture support.
+  (Jason Yates, #2671)
+* Allow `broadcast_to` matcher to take Symbols. (@Vagab, #2680)
+
+### 6.0.2 / 2023-05-04
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.1...v6.0.2)
+
+Bug Fixes:
+
+* Fix ActionView::PathSet when `render_views` is off for Rails 7.1.
+  (Eugene Kenny, Iliana, #2631)
+* Support Rails 7.1's `#fixtures_paths` in example groups (removes a deprecation warning).
+  (Nicholas Simmons, #2664)
+* Fix `have_enqueued_job` to properly detect enqueued jobs when other jobs were
+  performed inside the expectation block. (Slava Kardakov, Phil Pirozhkov, #2573)
+
+### 6.0.1 / 2022-10-18
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.0...v6.0.1)
+
+Bug Fixes:
+
+* Prevent tagged logged support in Rails 7 calling `#name`. (Jon Rowe, #2625)
+
+### 6.0.0 / 2022-10-10
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.1.2...v6.0.0)
+
+Enhancements:
+
+* Support Rails 7
+* Template tweaks to remove instance variables from generated specs. (Takuma Ishikawa, #2599)
+* Generators now respects default path configuration option. (@vivekmiyani, #2508)
+
+Breaking Changes:
+
+* Drop support for Rails below 6.1
+* Drop support for Ruby below 2.5 (following supported versions of Rails 6.1)
+* Change the order of `after_teardown` from `after` to `around` in system
+  specs to improve compatibility with extensions and Capybara. (Tim Diggins, #2596)
+
+Deprecations:
+
+* Deprecates integration spec generator (`rspec:integration`)
+  which was an alias of request spec generator (`rspec:request`)
+  (Luka Lüdicke, #2374)
+
+### 5.1.2 / 2022-04-24
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.1.1...v5.1.2)
 
 Bug Fixes:
 
@@ -31,8 +127,9 @@ Bug Fixes:
 
 * Properly name params in controller and request spec templates when
   using the `--model-name` parameter. (@kenzo-tanaka, #2534)
-* Fix support for `have_enqueued_mail` on Ruby 3.1 with Rails 6.1.
-  (Fabio Napoleoni, Mikael Henriksson, Phil Pirozhkov, Jon Rowe, #2566)
+* Fix parameter matching with mail delivery job and
+  ActionMailer::MailDeliveryJob. (Fabio Napoleoni, #2516, #2546)
+* Fix Rails 7 `have_enqueued_mail` compatibility (Mikael Henriksson, #2537, #2546)
 
 ### 5.0.2 / 2021-08-14
 [Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.0.1...v5.0.2)
@@ -78,7 +175,7 @@ Bug Fixes:
 
 Enhancements:
 
-* Issue a warning when using job matchers with `#at` mis-match on `usec` precision.
+* Issue a warning when using job matchers with `#at` mismatch on `usec` precision.
   (Jon Rowe, #2350)
 * Generated request specs now have a bare `_spec` suffix instead of `request_spec`.
   (Eloy Espinaco, Luka Lüdicke, #2355, #2356, #2378)
@@ -205,7 +302,7 @@ Bug Fixes:
 
 Bug Fixes:
 
-* Namespaced fixtures now generate a `/` seperated path rather than an `_`.
+* Namespaced fixtures now generate a `/` separated path rather than an `_`.
   (@nxlith, #2077)
 * Check the arity of `errors` before attempting to use it to generate the `be_valid`
   error message. (Kevin Kuchta, #2096)
@@ -365,7 +462,7 @@ Enhancements:
 
 Bug fixes:
 
-* Prevent asset helpers from taking precendence over route helpers. (Prem Sichanugrist, #1496)
+* Prevent asset helpers from taking precedence over route helpers. (Prem Sichanugrist, #1496)
 * Prevent `NoMethodError` during failed `have_rendered` assertions on weird templates.
   (Jon Rowe, #1623).
 

data/README.md

@@ -9,13 +9,12 @@ detailed explanations of how the application is supposed to behave,
 expressed in plain English.
 
 According to [RSpec Rails new versioning strategy][] use:
-* **[`rspec-rails` 5.x][]** for Rails 6.x.
+* **[`rspec-rails` 6.x][]** for Rails 6.1 or 7.x.
+* **[`rspec-rails` 5.x][]** for Rails 5.2 or 6.x.
 * **[`rspec-rails` 4.x][]** for Rails from 5.x or 6.x.
 * **[`rspec-rails` 3.x][]** for Rails earlier than 5.0.
 * **[`rspec-rails` 1.x][]** for Rails 2.x.
 
-[Build Status]: https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=main
-[travis-ci]: https://travis-ci.org/rspec/rspec-rails
 [Code Climate]: https://codeclimate.com/github/rspec/rspec-rails.svg
 [code-climate]: https://codeclimate.com/github/rspec/rspec-rails
 [Gem Version]: https://badge.fury.io/rb/rspec-rails.svg
@@ -25,13 +24,15 @@ According to [RSpec Rails new versioning strategy][] use:
 [`rspec-rails` 1.x]: https://github.com/dchelimsky/rspec-rails
 [`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-0-maintenance
+[`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-1-maintenance
+[`rspec-rails` 6.x]: https://github.com/rspec/rspec-rails/tree/6-1-maintenance
 [RSpec Rails 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 [`5-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/5-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 [`5-0-maintenance` branch on Github](https://github.com/rspec/rspec-rail
    ```ruby
    # Run against this stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 5.0.0'
+     gem 'rspec-rails', '~> 6.1.0'
    end
 
    # Or, run against the main branch
@@ -86,8 +87,8 @@ read the [`rspec-rails` upgrade notes][] to find out what to watch out for.
 
 Be sure to check the general [RSpec upgrade notes][] as well.
 
-[`rspec-rails` upgrade notes]: https://www.relishapp.com/rspec/rspec-rails/docs/upgrade
-[RSpec upgrade notes]: https://relishapp.com/rspec/docs/upgrade
+[`rspec-rails` upgrade notes]: https://rspec.info/features/6-0/rspec-rails/upgrade
+[RSpec upgrade notes]: https://rspec.info/upgrading-from-rspec-2/
 
 ## Usage
 
@@ -181,7 +182,7 @@ rspec ./spec/models/post_spec.rb:3 # Post before publication cannot have comment
 For an in-depth look at the RSpec DSL, including lots of examples,
 read the official Cucumber documentation for [RSpec Core][].
 
-[RSpec Core]: https://relishapp.com/rspec/rspec-core/docs
+[RSpec Core]: https://rspec.info/features/3-12/rspec-core
 
 ### Helpful Rails Matchers
 
@@ -207,23 +208,23 @@ to test the various parts of a Rails system:
 
 Follow the links above for examples of how each matcher is used.
 
-[the matchers that come standard in RSpec]: https://relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-[`be_a_new`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/be-a-new-matcher
-[`render_template`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/render-template-matcher
-[`redirect_to`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/redirect-to-matcher
-[`route_to`]: https://relishapp.com/rspec/rspec-rails/docs/routing-specs/route-to-matcher
-[`be_routable`]: https://relishapp.com/rspec/rspec-rails/docs/routing-specs/be-routable-matcher
-[`have_http_status`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/have-http-status-matcher
-[`match_array`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/activerecord-relation-match-array
-[`have_been_enqueued`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/have-been-enqueued-matcher
-[`have_enqueued_job`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/have-enqueued-job-matcher
+[the matchers that come standard in RSpec]: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers
+[`be_a_new`]: https://rspec.info/features/6-0/rspec-rails/matchers/new-record-matcher
+[`render_template`]: https://rspec.info/features/6-0/rspec-rails/matchers/render-template-matcher
+[`redirect_to`]: https://rspec.info/features/6-0/rspec-rails/matchers/redirect-to-matcher
+[`route_to`]: https://rspec.info/features/6-0/rspec-rails/routing-specs/route-to-matcher
+[`be_routable`]: https://rspec.info/features/6-0/rspec-rails/routing-specs/be-routable-matcher
+[`have_http_status`]: https://rspec.info/features/6-0/rspec-rails/matchers/have-http-status-matcher
+[`match_array`]: https://rspec.info/features/6-0/rspec-rails/matchers/relation-match-array
+[`have_been_enqueued`]: https://rspec.info/features/6-0/rspec-rails/matchers/have-been-enqueued-matcher
+[`have_enqueued_job`]: https://rspec.info/features/6-0/rspec-rails/matchers/have-enqueued-job-matcher
 
 ### What else does RSpec Rails add?
 
 For a comprehensive look at RSpec Rails’ features,
 read the [official Cucumber documentation][].
 
-[official Cucumber documentation]: https://relishapp.com/rspec/rspec-rails/docs
+[official Cucumber documentation]: https://rspec.info/features/6-0/rspec-rails
 
 ## What tests should I write?
 
@@ -268,20 +269,20 @@ RSpec.describe User, type: :model do
 ...
 ```
 
-[request]: https://relishapp.com/rspec/rspec-rails/docs/request-specs/request-spec
-[feature]: https://www.relishapp.com/rspec/rspec-rails/docs/feature-specs/feature-spec
-[system]: https://relishapp.com/rspec/rspec-rails/docs/system-specs/system-spec
-[model]: https://www.relishapp.com/rspec/rspec-rails/docs/model-specs
-[controller]: https://www.relishapp.com/rspec/rspec-rails/docs/controller-specs
-[mailer]: https://relishapp.com/rspec/rspec-rails/docs/mailer-specs
-[job]: https://relishapp.com/rspec/rspec-rails/docs/job-specs/job-spec
-[view]: https://www.relishapp.com/rspec/rspec-rails/docs/view-specs/view-spec
-[routing]: https://www.relishapp.com/rspec/rspec-rails/docs/routing-specs
-[helper]: https://www.relishapp.com/rspec/rspec-rails/docs/helper-specs/helper-spec
+[request]: https://rspec.info/features/6-0/rspec-rails/request-specs/request-spec
+[feature]: https://rspec.info/features/6-0/rspec-rails/feature-specs/feature-spec
+[system]: https://rspec.info/features/6-0/rspec-rails/system-specs/system-specs
+[model]: https://rspec.info/features/6-0/rspec-rails/model-specs
+[controller]: https://rspec.info/features/6-0/rspec-rails/controller-specs
+[mailer]: https://rspec.info/features/6-0/rspec-rails/mailer-specs
+[job]: https://rspec.info/features/6-0/rspec-rails/job-specs/job-spec
+[view]: https://rspec.info/features/6-0/rspec-rails/view-specs/view-spec
+[routing]: https://rspec.info/features/6-0/rspec-rails/routing-specs
+[helper]: https://rspec.info/features/6-0/rspec-rails/helper-specs/helper-spec
 [`ActionDispatch::IntegrationTest`]: https://api.rubyonrails.org/classes/ActionDispatch/IntegrationTest.html
 [`ActionDispatch::SystemTestCase`]: https://api.rubyonrails.org/classes/ActionDispatch/SystemTestCase.html
 [`ActionController::TestCase`]: https://api.rubyonrails.org/classes/ActionController/TestCase.html
-[in the appropriate folder]: https://relishapp.com/rspec/rspec-rails/docs/directory-structure
+[in the appropriate folder]: https://rspec.info/features/6-0/rspec-rails/directory-structure
 
 ### System specs, feature specs, request specs–what’s the difference?
 
@@ -364,10 +365,10 @@ you can run the specs and Cucumber features, or submit a pull request.
 
 ### RSpec base libraries
 
-* <https://github.com/rspec/rspec>
-* <https://github.com/rspec/rspec-core>
-* <https://github.com/rspec/rspec-expectations>
-* <https://github.com/rspec/rspec-mocks>
+* https://github.com/rspec/rspec
+* https://github.com/rspec/rspec-core
+* https://github.com/rspec/rspec-expectations
+* https://github.com/rspec/rspec-mocks
 
 ### Recommended third-party extensions
 

data/lib/generators/rspec/channel/channel_generator.rb

@@ -5,7 +5,7 @@ module Rspec
     # @private
     class ChannelGenerator < Base
       def create_channel_spec
-        template 'channel_spec.rb.erb', File.join('spec/channels', class_path, "#{file_name}_channel_spec.rb")
+        template 'channel_spec.rb.erb', target_path('channels', class_path, "#{file_name}_channel_spec.rb")
       end
     end
   end

data/lib/generators/rspec/controller/controller_generator.rb

@@ -16,14 +16,14 @@ module Rspec
         return unless options[:request_specs]
 
         template 'request_spec.rb',
-                 File.join('spec/requests', class_path, "#{file_name}_spec.rb")
+                 target_path('requests', class_path, "#{file_name}_spec.rb")
       end
 
       def generate_controller_spec
         return unless options[:controller_specs]
 
         template 'controller_spec.rb',
-                 File.join('spec/controllers', class_path, "#{file_name}_controller_spec.rb")
+                 target_path('controllers', class_path, "#{file_name}_controller_spec.rb")
       end
 
       def generate_view_specs
@@ -35,7 +35,7 @@ module Rspec
         actions.each do |action|
           @action = action
           template 'view_spec.rb',
-                   File.join("spec", "views", file_path, "#{@action}.html.#{options[:template_engine]}_spec.rb")
+                   target_path('views', file_path, "#{@action}.html.#{options[:template_engine]}_spec.rb")
         end
       end
 
@@ -44,7 +44,7 @@ module Rspec
         return unless options[:routing_specs]
 
         template 'routing_spec.rb',
-                 File.join('spec/routing', class_path, "#{file_name}_routing_spec.rb")
+                 target_path('routing', class_path, "#{file_name}_routing_spec.rb")
       end
     end
   end

data/lib/generators/rspec/feature/feature_generator.rb

@@ -10,7 +10,7 @@ module Rspec
       def generate_feature_spec
         return unless options[:feature_specs]
 
-        template template_name, File.join('spec/features', class_path, filename)
+        template template_name, target_path('features', class_path, filename)
       end
 
       def template_name

data/lib/generators/rspec/generator/generator_generator.rb

@@ -9,7 +9,7 @@ module Rspec
       def generate_generator_spec
         return unless options[:generator_specs]
 
-        template template_name, File.join('spec/generator', class_path, filename)
+        template template_name, target_path('generator', class_path, filename)
       end
 
       def template_name

data/lib/generators/rspec/helper/helper_generator.rb

@@ -9,7 +9,7 @@ module Rspec
       def generate_helper_spec
         return unless options[:helper_specs]
 
-        template 'helper_spec.rb', File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
+        template 'helper_spec.rb', target_path('helpers', class_path, "#{file_name}_helper_spec.rb")
       end
     end
   end

data/lib/generators/rspec/install/install_generator.rb

@@ -12,6 +12,8 @@ Description:
     Copy rspec files to your application.
 DESC
 
+      class_option :default_path, type: :string, default: 'spec'
+
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
@@ -20,12 +22,12 @@ DESC
         Dir.mktmpdir do |dir|
           generate_rspec_init dir
           template File.join(dir, '.rspec'), '.rspec'
-          directory File.join(dir, 'spec'), 'spec'
+          directory File.join(dir, 'spec'), default_path
         end
       end
 
       def copy_rails_files
-        template 'spec/rails_helper.rb'
+        template 'spec/rails_helper.rb', "#{default_path}/rails_helper.rb"
       end
 
     private
@@ -41,6 +43,12 @@ DESC
 
         replace_generator_command(spec_helper_path)
         remove_warnings_configuration(spec_helper_path)
+
+        unless default_path == "spec"
+          dot_rspec_path = File.join(tmpdir, '.rspec')
+
+          append_default_path(dot_rspec_path)
+        end
       end
 
       def replace_generator_command(spec_helper_path)
@@ -58,6 +66,15 @@ DESC
                   '',
                   verbose: false
       end
+
+      def append_default_path(dot_rspec_path)
+        append_to_file dot_rspec_path,
+                       "--default-path #{default_path}"
+      end
+
+      def default_path
+        options[:default_path]
+      end
     end
   end
 end

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

@@ -20,7 +20,7 @@ require 'rspec/rails'
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
+# Rails.root.glob('spec/support/**/*.rb').sort.each { |f| require f }
 
 <% if RSpec::Rails::FeatureCheck.has_active_record_migration? -%>
 # Checks for pending migrations and applies them before tests are run.
@@ -28,14 +28,19 @@ require 'rspec/rails'
 begin
   ActiveRecord::Migration.maintain_test_schema!
 rescue ActiveRecord::PendingMigrationError => e
-  puts e.to_s.strip
-  exit 1
+  abort e.to_s.strip
 end
 <% end -%>
 RSpec.configure do |config|
 <% if RSpec::Rails::FeatureCheck.has_active_record? -%>
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+<% if ::Rails::VERSION::STRING < "7.1.0" -%>
+  config.fixture_path = Rails.root.join('spec/fixtures')
+<% else -%>
+  config.fixture_paths = [
+    Rails.root.join('spec/fixtures')
+  ]
+<% end -%>
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -49,11 +54,11 @@ RSpec.configure do |config|
   # Remove this line to enable support for ActiveRecord
   config.use_active_record = false
 
-  # If you enable ActiveRecord support you should unncomment these lines,
+  # If you enable ActiveRecord support you should uncomment these lines,
   # note if you'd prefer not to run each example within a transaction, you
   # should set use_transactional_fixtures to false.
   #
-  # config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # config.fixture_path = Rails.root.join('spec/fixtures')
   # config.use_transactional_fixtures = true
 
 <% end -%>
@@ -69,7 +74,7 @@ RSpec.configure do |config|
   #     end
   #
   # The different available types are documented in the features, such as in
-  # https://relishapp.com/rspec/rspec-rails/docs
+  # https://rspec.info/features/6-0/rspec-rails
   config.infer_spec_type_from_file_location!
 
   # Filter lines from Rails gems in backtraces.

data/lib/generators/rspec/integration/integration_generator.rb

@@ -1,21 +1,28 @@
 require 'generators/rspec'
+require 'rspec/core/warnings'
 
 module Rspec
   module Generators
     # @private
     class IntegrationGenerator < Base
-      # Add a deprecation for this class, before rspec-rails 4, to use the
-      # `RequestGenerator` instead
       class_option :request_specs,
                    type: :boolean,
                    default: true,
                    desc: "Generate request specs"
 
+      source_paths << File.expand_path('../request/templates', __dir__)
+
       def generate_request_spec
         return unless options[:request_specs]
 
+        RSpec.warn_deprecation <<-WARNING.gsub(/\s*\|/, ' ')
+          |The integration generator is deprecated
+          |and will be deleted in RSpec-Rails 7.
+          |Please use the request generator instead.
+        WARNING
+
         template 'request_spec.rb',
-                 File.join('spec/requests', "#{name.underscore.pluralize}_spec.rb")
+                 target_path('requests', "#{name.underscore.pluralize}_spec.rb")
       end
     end
   end

data/lib/generators/rspec/job/job_generator.rb

@@ -6,7 +6,7 @@ module Rspec
     class JobGenerator < Base
       def create_job_spec
         file_suffix = file_name.end_with?('job') ? 'spec.rb' : 'job_spec.rb'
-        template 'job_spec.rb.erb', File.join('spec/jobs', class_path, [file_name, file_suffix].join('_'))
+        template 'job_spec.rb.erb', target_path('jobs', class_path, [file_name, file_suffix].join('_'))
       end
     end
   end

data/lib/generators/rspec/mailbox/mailbox_generator.rb

@@ -6,7 +6,7 @@ module Rspec
     class MailboxGenerator < Base
       def create_mailbox_spec
         template('mailbox_spec.rb.erb',
-                 File.join('spec/mailboxes', class_path, "#{file_name}_mailbox_spec.rb")
+                 target_path('mailboxes', class_path, "#{file_name}_mailbox_spec.rb")
         )
       end
     end

data/lib/generators/rspec/mailer/mailer_generator.rb

@@ -8,20 +8,20 @@ module Rspec
       argument :actions, type: :array, default: [], banner: "method method"
 
       def generate_mailer_spec
-        template "mailer_spec.rb", File.join('spec/mailers', class_path, "#{file_name}_spec.rb")
+        template "mailer_spec.rb", target_path('mailers', class_path, "#{file_name}_spec.rb")
       end
 
       def generate_fixtures_files
         actions.each do |action|
           @action, @path = action, File.join(file_path, action)
-          template "fixture", File.join("spec/fixtures", @path)
+          template "fixture", target_path("fixtures", @path)
         end
       end
 
       def generate_preview_files
         return unless RSpec::Rails::FeatureCheck.has_action_mailer_preview?
 
-        template "preview.rb", File.join("spec/mailers/previews", class_path, "#{file_name}_preview.rb")
+        template "preview.rb", target_path("mailers/previews", class_path, "#{file_name}_preview.rb")
       end
     end
   end

data/lib/generators/rspec/model/model_generator.rb

@@ -11,8 +11,8 @@ module Rspec
       class_option :fixture, type: :boolean
 
       def create_model_spec
-        template_file = File.join(
-          'spec/models',
+        template_file = target_path(
+          'models',
           class_path,
           "#{file_name}_spec.rb"
         )
@@ -24,7 +24,7 @@ module Rspec
       def create_fixture_file
         return unless missing_fixture_replacement?
 
-        template 'fixtures.yml', File.join('spec/fixtures', class_path, "#{(pluralize_table_names? ? plural_file_name : file_name)}.yml")
+        template 'fixtures.yml', target_path('fixtures', class_path, "#{(pluralize_table_names? ? plural_file_name : file_name)}.yml")
       end
 
     private

data/lib/generators/rspec/request/request_generator.rb

@@ -1,10 +1,17 @@
-require 'generators/rspec/integration/integration_generator'
+require 'generators/rspec'
 
 module Rspec
   module Generators
     # @private
-    class RequestGenerator < IntegrationGenerator
-      source_paths << File.expand_path('../integration/templates', __dir__)
+    class RequestGenerator < Base
+      class_option :request_specs, type: :boolean, default: true, desc: 'Generate request specs'
+
+      def generate_request_spec
+        return unless options[:request_specs]
+
+        template 'request_spec.rb',
+                 target_path('requests', "#{name.underscore.pluralize}_spec.rb")
+      end
     end
   end
 end

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -58,8 +58,8 @@ module Rspec
       def generate_routing_spec
         return unless options[:routing_specs]
 
-        template_file = File.join(
-          'spec/routing',
+        template_file = target_path(
+          'routing',
           controller_class_path,
           "#{controller_file_name}_routing_spec.rb"
         )
@@ -72,7 +72,7 @@ module Rspec
 
       def copy_view(view)
         template "#{view}_spec.rb",
-                 File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
+                 target_path("views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
       end
 
       # support for namespaced-resources
@@ -121,7 +121,7 @@ module Rspec
       end
 
       def template_file(folder:, suffix: '')
-        File.join('spec', folder, controller_class_path, "#{controller_file_name}#{suffix}_spec.rb")
+        target_path(folder, controller_class_path, "#{controller_file_name}#{suffix}_spec.rb")
       end
 
       def banner