rspec-rails 6.1.1 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ff6b0dc14db86b07e0cc46cd193329c85e21d15c9863ccbb5b73c54972daa6
-  data.tar.gz: c7bd505a3bfd16f881fb04b04e98ff7df9910d230eb17183fc68621a74d4b9d9
+  metadata.gz: e5f52b2377b281190553090f208b2d03f030aefb03395fb46afd8af1c63df3a1
+  data.tar.gz: 1a7c088f8ee631d5f9756277724554ccc30247719849a1dd0b6d03bfd8279e11
 SHA512:
-  metadata.gz: 6abbc3617dd82480b86c99c5d9347c94f8ac62bb944cf4ce1a223bea60046d9108be76fc3045a2e5f8549ad9813f7e831882f9ddee31de9d4215f643ce8a6d43
-  data.tar.gz: 07b551b367df408eaaa847307a6abd28a566a6a17ee4b552dc99a8bad95794f262884dc6e34a4d5717146fa001f89f6060cd1784818ed29f11f5361753fa606d
+  metadata.gz: 5dbf49c52a590a8ce6d91ced03bfc78ebeb4737b8cfcc11932e8959b38c0428eca4414da31a82172ca965db65fed36e490e8c85e761f1fed0f2ef555b9b75210
+  data.tar.gz: c47326924297943c4d0704f3da54f8ef13a849a73d3a023405cf290347698c0b486a8c692a8774cc022bbf92a80c424197bca1d44a1cd46c1a613cb0ffca3e79

data/Changelog.md

@@ -1,5 +1,62 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.1...6-1-maintenance)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v7.0.1...7-0-maintenance)
+
+### 7.0.1 / 2024-09-03
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v7.0.0...v7.0.1)
+
+Bug Fixes:
+
+* Remove mutation of Rails constant in favour of public api. (Petrik de Heus, #2789)
+* Cleanup Rails scaffold for unsupported versions. (Matt Jankowski, #2790)
+* Remove deprecated scaffold that was unintentionally included in 7.0.0
+  (Jon Rowe, #2791)
+
+### 7.0.0 / 2024-09-02
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.5...v7.0.0)
+
+Enhancements:
+
+* Change default driver for system specs on Rails 7.2 to match its default.
+  (Steve Polito, #2746)
+* Verify ActiveJob arguments by comparing to the method signature. (Oli Peate, #2745)
+* Add suggestion to rails_helper.rb to skip when not in test most. (Glauco Custódio, #2751)
+* Add `at_priority` qualifier to `have_enqueued_job` set of matchers. (mbajur, #2759)
+* Add spec directories to `rails stats` on Rails main / 8.0.0. (Petrik de Heus, #2781)
+
+### 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)
@@ -181,7 +238,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
@@ -584,7 +641,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

data/README.md

@@ -9,7 +9,8 @@ detailed explanations of how the application is supposed to behave,
 expressed in plain English.
 
 According to [RSpec Rails new versioning strategy][] use:
-* **[`rspec-rails` 6.x][]** for Rails 6.1 or 7.x.
+* **[`rspec-rails` 7.x][]** for Rails 7.x.
+* **[`rspec-rails` 6.x][]** for Rails 6.1.
 * **[`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.
@@ -26,11 +27,12 @@ According to [RSpec Rails new versioning strategy][] use:
 [`rspec-rails` 4.x]: https://github.com/rspec/rspec-rails/tree/4-1-maintenance
 [`rspec-rails` 5.x]: https://github.com/rspec/rspec-rails/tree/5-1-maintenance
 [`rspec-rails` 6.x]: https://github.com/rspec/rspec-rails/tree/6-1-maintenance
+[`rspec-rails` 7.x]: https://github.com/rspec/rspec-rails/tree/7-0-maintenance
 [RSpec Rails new versioning strategy]: https://github.com/rspec/rspec-rails/blob/main/rfcs/versioning-strategy.md
 
 ## Installation
 
-**IMPORTANT** This README / branch refers to the 6.1.x stable release series, only bugfixes from this series will
+**IMPORTANT** This README / branch refers to the 7.0.x stable release series, only bugfixes from this series will
 be added here. See the [`main` branch on Github](https://github.com/rspec/rspec-rails/tree/main) if you want or
 require the latest unstable features.
 
@@ -40,7 +42,7 @@ require the latest unstable features.
    ```ruby
    # Run against this stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 6.1.0'
+     gem 'rspec-rails', '~> 7.0.0'
    end
 
    # Or, run against the main branch
@@ -87,7 +89,7 @@ read the [`rspec-rails` upgrade notes][] to find out what to watch out for.
 
 Be sure to check the general [RSpec upgrade notes][] as well.
 
-[`rspec-rails` upgrade notes]: https://rspec.info/features/6-0/rspec-rails/upgrade
+[`rspec-rails` upgrade notes]: https://rspec.info/features/7-0/rspec-rails/upgrade
 [RSpec upgrade notes]: https://rspec.info/upgrading-from-rspec-2/
 
 ## Usage
@@ -209,22 +211,22 @@ to test the various parts of a Rails system:
 Follow the links above for examples of how each matcher is used.
 
 [the matchers that come standard in RSpec]: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers
-[`be_a_new`]: https://rspec.info/features/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
+[`be_a_new`]: https://rspec.info/features/7-0/rspec-rails/matchers/new-record-matcher
+[`render_template`]: https://rspec.info/features/7-0/rspec-rails/matchers/render-template-matcher
+[`redirect_to`]: https://rspec.info/features/7-0/rspec-rails/matchers/redirect-to-matcher
+[`route_to`]: https://rspec.info/features/7-0/rspec-rails/routing-specs/route-to-matcher
+[`be_routable`]: https://rspec.info/features/7-0/rspec-rails/routing-specs/be-routable-matcher
+[`have_http_status`]: https://rspec.info/features/7-0/rspec-rails/matchers/have-http-status-matcher
+[`match_array`]: https://rspec.info/features/7-0/rspec-rails/matchers/relation-match-array
+[`have_been_enqueued`]: https://rspec.info/features/7-0/rspec-rails/matchers/have-been-enqueued-matcher
+[`have_enqueued_job`]: https://rspec.info/features/7-0/rspec-rails/matchers/have-enqueued-job-matcher
 
 ### What else does RSpec Rails add?
 
 For a comprehensive look at RSpec Rails’ features,
 read the [official Cucumber documentation][].
 
-[official Cucumber documentation]: https://rspec.info/features/6-0/rspec-rails
+[official Cucumber documentation]: https://rspec.info/features/7-0/rspec-rails
 
 ## What tests should I write?
 
@@ -269,20 +271,20 @@ RSpec.describe User, type: :model do
 ...
 ```
 
-[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
+[request]: https://rspec.info/features/7-0/rspec-rails/request-specs/request-spec
+[feature]: https://rspec.info/features/7-0/rspec-rails/feature-specs/feature-spec
+[system]: https://rspec.info/features/7-0/rspec-rails/system-specs/system-specs
+[model]: https://rspec.info/features/7-0/rspec-rails/model-specs
+[controller]: https://rspec.info/features/7-0/rspec-rails/controller-specs
+[mailer]: https://rspec.info/features/7-0/rspec-rails/mailer-specs
+[job]: https://rspec.info/features/7-0/rspec-rails/job-specs/job-spec
+[view]: https://rspec.info/features/7-0/rspec-rails/view-specs/view-spec
+[routing]: https://rspec.info/features/7-0/rspec-rails/routing-specs
+[helper]: https://rspec.info/features/7-0/rspec-rails/helper-specs/helper-spec
 [`ActionDispatch::IntegrationTest`]: https://api.rubyonrails.org/classes/ActionDispatch/IntegrationTest.html
 [`ActionDispatch::SystemTestCase`]: https://api.rubyonrails.org/classes/ActionDispatch/SystemTestCase.html
 [`ActionController::TestCase`]: https://api.rubyonrails.org/classes/ActionController/TestCase.html
-[in the appropriate folder]: https://rspec.info/features/6-0/rspec-rails/directory-structure
+[in the appropriate folder]: https://rspec.info/features/7-0/rspec-rails/directory-structure
 
 ### System specs, feature specs, request specs–what’s the difference?
 

data/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 @@ module Rspec
       end
 
       def filename
-        "#{table_name}_generator_spec.rb"
+        "#{file_name}_generator_spec.rb"
       end
     end
   end

data/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

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

@@ -4,6 +4,11 @@ ENV['RAILS_ENV'] ||= 'test'
 require_relative '../config/environment'
 # Prevent database truncation if the environment is production
 abort("The Rails environment is running in production mode!") if Rails.env.production?
+<% if RSpec::Rails::FeatureCheck.has_active_record_migration? -%>
+# Uncomment the line below in case you have `--require rails_helper` in the `.rspec` file
+# that will avoid rails generators crashing because migrations haven't been run yet
+# return unless Rails.env.test?
+<% end -%>
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 
@@ -20,7 +25,7 @@ require 'rspec/rails'
 # 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.
@@ -74,7 +79,7 @@ RSpec.configure do |config|
   #     end
   #
   # The different available types are documented in the features, such as in
-  # https://rspec.info/features/6-0/rspec-rails
+  # https://rspec.info/features/7-0/rspec-rails
   config.infer_spec_type_from_file_location!
 
   # Filter lines from Rails gems in backtraces.

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

@@ -8,7 +8,8 @@ module Rspec
       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 @@ module Rspec
       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

data/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

data/lib/generators/rspec/scaffold/templates/controller_spec.rb

@@ -90,17 +90,10 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     end
 
     context "with invalid params" do
-    <% if Rails.version.to_f < 7.0 %>
-      it "returns a success response (i.e. to display the 'new' template)" do
-        post :create, params: {<%= singular_table_name %>: invalid_attributes}, session: valid_session
-        expect(response).to be_successful
-      end
-    <% else %>
       it "renders a response with 422 status (i.e. to display the 'new' template)" do
         post :create, params: {<%= singular_table_name %>: invalid_attributes}, session: valid_session
         expect(response).to have_http_status(:unprocessable_entity)
       end
-    <% end %>
     end
   end
 
@@ -125,19 +118,11 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     end
 
     context "with invalid params" do
-    <% if Rails.version.to_f < 7.0 %>
-      it "returns a success response (i.e. to display the 'edit' template)" do
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
-        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: invalid_attributes}, session: valid_session
-        expect(response).to be_successful
-      end
-    <% else %>
       it "renders a response with 422 status (i.e. to display the 'edit' template)" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: invalid_attributes}, session: valid_session
         expect(response).to have_http_status(:unprocessable_entity)
       end
-    <% end %>
     end
   end
 

data/lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
 
   it "renders a list of <%= ns_table_name %>" do
     render
-    cell_selector = Rails::VERSION::STRING >= '7' ? 'div>p' : 'tr>td'
+    cell_selector = 'div>p'
 <% for attribute in output_attributes -%>
     assert_select cell_selector, text: Regexp.new(<%= value_for(attribute) %>.to_s), count: 2
 <% end -%>

data/lib/generators/rspec/scaffold/templates/request_spec.rb

@@ -83,17 +83,10 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
         }.to change(<%= class_name %>, :count).by(0)
       end
 
-    <% if Rails.version.to_f < 7.0 %>
-      it "renders a successful response (i.e. to display the 'new' template)" do
-        post <%= index_helper %>_url, params: { <%= singular_table_name %>: invalid_attributes }
-        expect(response).to be_successful
-      end
-    <% else %>
       it "renders a response with 422 status (i.e. to display the 'new' template)" do
         post <%= index_helper %>_url, params: { <%= singular_table_name %>: invalid_attributes }
         expect(response).to have_http_status(:unprocessable_entity)
       end
-    <% end %>
     end
   end
 
@@ -119,19 +112,11 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
     end
 
     context "with invalid parameters" do
-    <% if Rails.version.to_f < 7.0 %>
-      it "renders a successful response (i.e. to display the 'edit' template)" do
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
-        patch <%= show_helper %>, params: { <%= singular_table_name %>: invalid_attributes }
-        expect(response).to be_successful
-      end
-    <% else %>
       it "renders a response with 422 status (i.e. to display the 'edit' template)" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         patch <%= show_helper %>, params: { <%= singular_table_name %>: invalid_attributes }
         expect(response).to have_http_status(:unprocessable_entity)
       end
-    <% end %>
     end
   end
 

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

@@ -69,7 +69,7 @@ module RSpec
       #
       # @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)

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

@@ -2,9 +2,8 @@
 # suite and ammeter.
 require 'rspec/rails/matchers'
 
-if ::Rails::VERSION::MAJOR >= 7
-  require 'active_support/execution_context/test_helper'
-end
+require 'active_support/current_attributes/test_helper'
+require 'active_support/execution_context/test_helper'
 
 module RSpec
   module Rails
@@ -16,10 +15,9 @@ module RSpec
       include RSpec::Rails::MinitestLifecycleAdapter
       include RSpec::Rails::MinitestAssertionAdapter
       include RSpec::Rails::FixtureSupport
-      if ::Rails::VERSION::MAJOR >= 7
-        include RSpec::Rails::TaggedLoggingAdapter
-        include ActiveSupport::ExecutionContext::TestHelper
-      end
+      include RSpec::Rails::TaggedLoggingAdapter
+      include ActiveSupport::CurrentAttributes::TestHelper
+      include ActiveSupport::ExecutionContext::TestHelper
     end
   end
 end

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

@@ -1,5 +1,3 @@
-require "action_dispatch/testing/assertions/routing"
-
 module RSpec
   module Rails
     # @private

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

@@ -95,6 +95,14 @@ module RSpec
         ::Rails.application
       end
 
+      # Default driver to assign if none specified.
+      DEFAULT_DRIVER =
+        if ::Rails::VERSION::STRING.to_f >= 7.2
+          :selenium_chrome_headless
+        else
+          :selenium
+        end
+
       included do |other|
         ActiveSupport.on_load(:action_dispatch_system_test_case) do
           ActionDispatch::SystemTesting::Server.silence_puma = true
@@ -137,7 +145,7 @@ module RSpec
           self.class.before do
             # A user may have already set the driver, so only default if driver
             # is not set
-            driven_by(:selenium) unless @driver
+            driven_by(DEFAULT_DRIVER) unless @driver
           end
         end
 

data/lib/rspec/rails/fixture_support.rb

@@ -10,8 +10,7 @@ module RSpec
         include ActiveRecord::TestFixtures
 
         # @private prevent ActiveSupport::TestFixtures to start a DB transaction.
-        # Monkey patched to avoid collisions with 'let(:name)' in Rails 6.1 and after
-        # and let(:method_name) before Rails 6.1.
+        # Monkey patched to avoid collisions with 'let(:name)' since Rails 6.1
         def run_in_transaction?
           current_example_name = (RSpec.current_example && RSpec.current_example.metadata[:description])
           use_transactional_tests && !self.class.uses_transaction?(current_example_name)

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

@@ -14,6 +14,7 @@ module RSpec
           def initialize
             @args = []
             @queue = nil
+            @priority = nil
             @at = nil
             @block = proc { }
             set_expected_number(:exactly, 1)
@@ -30,6 +31,11 @@ module RSpec
             self
           end
 
+          def at_priority(priority)
+            @priority = priority.to_i
+            self
+          end
+
           def at(time_or_date)
             case time_or_date
             when Time then @at = Time.at(time_or_date.to_f)
@@ -71,6 +77,8 @@ module RSpec
           end
 
           def failure_message
+            return @failure_message if defined?(@failure_message)
+
             "expected to #{self.class::FAILURE_MESSAGE_EXPECTATION_ACTION} #{base_message}".tap do |msg|
               if @unmatching_jobs.any?
                 msg << "\nQueued jobs:"
@@ -101,7 +109,7 @@ module RSpec
 
           def check(jobs)
             @matching_jobs, @unmatching_jobs = jobs.partition do |job|
-              if job_match?(job) && arguments_match?(job) && queue_match?(job) && at_match?(job)
+              if matches_constraints?(job)
                 args = deserialize_arguments(job)
                 @block.call(*args)
                 true
@@ -109,6 +117,12 @@ module RSpec
                 false
               end
             end
+
+            if (signature_mismatch = detect_args_signature_mismatch(@matching_jobs))
+              @failure_message = signature_mismatch
+              return false
+            end
+
             @matching_jobs_count = @matching_jobs.size
 
             case @expectation_type
@@ -123,6 +137,7 @@ module RSpec
               msg << " with #{@args}," if @args.any?
               msg << " on queue #{@queue}," if @queue
               msg << " at #{@at.inspect}," if @at
+              msg << " with priority #{@priority}," if @priority
               msg << " but #{self.class::MESSAGE_EXPECTATION_ACTION} #{@matching_jobs_count}"
             end
           end
@@ -132,13 +147,23 @@ module RSpec
             msg_parts << "with #{deserialize_arguments(job)}" if job[:args].any?
             msg_parts << "on queue #{job[:queue]}" if job[:queue]
             msg_parts << "at #{Time.at(job[:at])}" if job[:at]
+            msg_parts <<
+              if job[:priority]
+                "with priority #{job[:priority]}"
+              else
+                "with no priority specified"
+              end
 
             "#{job[:job].name} job".tap do |msg|
               msg << " #{msg_parts.join(', ')}" if msg_parts.any?
             end
           end
 
-          def job_match?(job)
+          def matches_constraints?(job)
+            job_matches?(job) && arguments_match?(job) && queue_match?(job) && at_match?(job) && priority_match?(job)
+          end
+
+          def job_matches?(job)
             @job ? @job == job[:job] : true
           end
 
@@ -152,12 +177,39 @@ module RSpec
             end
           end
 
+          def detect_args_signature_mismatch(jobs)
+            jobs.each do |job|
+              args = deserialize_arguments(job)
+
+              if (signature_mismatch = check_args_signature_mismatch(job.fetch(:job), :perform, args))
+                return signature_mismatch
+              end
+            end
+
+            nil
+          end
+
+          def check_args_signature_mismatch(job_class, job_method, args)
+            signature = Support::MethodSignature.new(job_class.public_instance_method(job_method))
+            verifier = Support::StrictSignatureVerifier.new(signature, args)
+
+            unless verifier.valid?
+              "Incorrect arguments passed to #{job_class.name}: #{verifier.error_message}"
+            end
+          end
+
           def queue_match?(job)
             return true unless @queue
 
             @queue == job[:queue]
           end
 
+          def priority_match?(job)
+            return true unless @priority
+
+            @priority == job[:priority]
+          end
+
           def at_match?(job)
             return true unless @at
             return job[:at].nil? if @at == :no_wait
@@ -384,33 +436,33 @@ module RSpec
       #
       # @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)

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

@@ -41,6 +41,8 @@ module RSpec
         end
 
         def failure_message
+          return @failure_message if defined?(@failure_message)
+
           "expected to enqueue #{base_message}".tap do |msg|
             msg << "\n#{unmatching_mail_jobs_message}" if unmatching_mail_jobs.any?
           end
@@ -89,6 +91,22 @@ module RSpec
           super(job)
         end
 
+        def detect_args_signature_mismatch(jobs)
+          return if @method_name.nil?
+
+          mailer_class = mailer_class_name.constantize
+
+          jobs.each do |job|
+            mailer_args = extract_args_without_parameterized_params(job)
+
+            if (signature_mismatch = check_args_signature_mismatch(mailer_class, @method_name, mailer_args))
+              return signature_mismatch
+            end
+          end
+
+          nil
+        end
+
         def base_mailer_args
           [mailer_class_name, @method_name.to_s, MAILER_JOB_METHOD]
         end
@@ -157,6 +175,19 @@ module RSpec
           end
         end
 
+        def extract_args_without_parameterized_params(job)
+          args = deserialize_arguments(job)
+          mailer_args = args - base_mailer_args
+
+          if parameterized_mail?(job)
+            mailer_args = mailer_args[1..-1] # ignore parameterized params
+          elsif mailer_args.last.is_a?(Hash) && mailer_args.last.key?(:args)
+            mailer_args = args.last[:args]
+          end
+
+          mailer_args
+        end
+
         def legacy_mail?(job)
           RSpec::Rails::FeatureCheck.has_action_mailer_legacy_delivery_job? && job[:job] <= ActionMailer::DeliveryJob
         end

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

@@ -33,7 +33,7 @@ module RSpec
         # @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 @@ module RSpec
           # @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
 
@@ -237,7 +233,7 @@ module RSpec
         #   expect(response).to have_http_status(:redirect)
         #
         # @see RSpec::Rails::Matchers#have_http_status
-        # @see https://github.com/rails/rails/blob/6-0-stable/actionpack/lib/action_dispatch/testing/test_response.rb `ActionDispatch::TestResponse`
+        # @see https://github.com/rails/rails/blob/7-2-stable/actionpack/lib/action_dispatch/testing/test_response.rb `ActionDispatch::TestResponse`
         class GenericStatus < RSpec::Rails::Matchers::BaseMatcher
           include HaveHttpStatus
 

data/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")

data/lib/rspec/rails/version.rb

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

data/lib/rspec-rails.rb

@@ -9,6 +9,23 @@ module RSpec
       # 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")
+
+      # As of Rails 8.0.0 you can register directories to work with `rails stats`
+      if ::Rails::VERSION::STRING >= "8.0.0"
+        require 'rails/code_statistics'
+
+        dirs = Dir['./spec/**/*_spec.rb']
+          .map { |f| f.sub(/^\.\/(spec\/\w+)\/.*/, '\\1') }
+          .uniq
+          .select { |f| File.directory?(f) }
+
+        Hash[dirs.map { |d| [d.split('/').last, d] }].each do |type, dir|
+          name = type.singularize.capitalize
+
+          ::Rails::CodeStatistics.register_directory "#{name} specs", dir, test_directory: true
+        end
+      end
+
       generators = config.app_generators
       generators.integration_tool :rspec
       generators.test_framework :rspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 7.0.1
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -52,98 +52,98 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-description: rspec-rails is a testing framework for Rails 5+.
+description: rspec-rails integrates the Rails testing helpers into RSpec.
 email: rspec@googlegroups.com
 executables: []
 extensions: []
@@ -215,7 +215,6 @@ files:
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
 - lib/generators/rspec/install/templates/spec/rails_helper.rb
-- lib/generators/rspec/integration/integration_generator.rb
 - lib/generators/rspec/job/job_generator.rb
 - lib/generators/rspec/job/templates/job_spec.rb.erb
 - lib/generators/rspec/mailbox/mailbox_generator.rb
@@ -297,7 +296,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-rails/issues
-  changelog_uri: https://github.com/rspec/rspec-rails/blob/v6.1.1/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-rails/blob/v7.0.1/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-rails
@@ -310,14 +309,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: RSpec for Rails

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

@@ -1,29 +0,0 @@
-require 'generators/rspec'
-require 'rspec/core/warnings'
-
-module Rspec
-  module Generators
-    # @private
-    class IntegrationGenerator < Base
-      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',
-                 target_path('requests', "#{name.underscore.pluralize}_spec.rb")
-      end
-    end
-  end
-end