Avoid having undefined method on assert_nothing_raised

Author: benoittgt

lib/rspec/rails.rb

@@ -8,7 +8,6 @@
 # Load the rspec-rails parts
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/matchers'
-require 'rspec/rails/active_support_testing_assertion'
 require 'rspec/rails/fixture_support'
 require 'rspec/rails/file_fixture_support'
 require 'rspec/rails/fixture_file_upload_support'

lib/rspec/rails/active_support_testing_assertion.rb

@@ -71,6 +71,9 @@ def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
       config.add_setting :fixture_path
       config.include RSpec::Rails::FixtureSupport, :use_fixtures
 
+      # Prevent test from failing on undefined method used in ActiveSupport testing helpers
+      config.include ActiveSupport::Testing::Assertions
+
       # We'll need to create a deprecated module in order to properly report to
       # gems / projects which are relying on this being loaded globally.
       #
@@ -85,10 +88,6 @@ def self.initialize_configuration(config) # rubocop:disable Metrics/MethodLength
         config.include RSpec::Rails::FileFixtureSupport
       end
 
-      if ::Rails.version.to_f >= 6.1
-        config.include RSpec::Rails::ActiveSupportTestingAssertion
-      end
-
       # Add support for fixture_path on fixture_file_upload
       config.include RSpec::Rails::FixtureFileUploadSupport
 
@@ -174,6 +173,7 @@ def filter_rails_from_backtrace!
         end
       end
 
+
       if RSpec::Rails::FeatureCheck.has_action_mailer?
         config.include RSpec::Rails::MailerExampleGroup, type: :mailer
         config.after { ActionMailer::Base.deliveries.clear }

lib/rspec/rails/configuration.rb

@@ -297,4 +297,14 @@ def welcome(to:)
   it "has a default #file_fixture_path of 'spec/fixtures/files'" do
     expect(config.file_fixture_path).to eq("spec/fixtures/files")
   end
+
+  describe 'ActiveSupport::Testing::Assertions requirements' do
+    it 'does not raise that "assert_nothing_raised" is not undefined' do
+      expect {
+        assert_nothing_raised do
+          :foo
+        end
+      }.to_not raise_error
+    end
+  end
 end