Merge pull request #2857 from rspec/reduce-sandboxing-to-fix-missed-deprecation-reports

JonRowe · web-flow · commit c112d70acd0e · 2025-09-15T11:48:10.000Z
Reduce sandboxing to prevent swallowed deprecations
diff --git a/spec/rspec/rails/configuration_spec.rb b/spec/rspec/rails/configuration_spec.rb
@@ -123,7 +123,7 @@
     end
   end
 
-  describe "#infer_spec_type_from_file_location!" do
+  describe "#infer_spec_type_from_file_location!", :with_isolated_config do
     def in_inferring_type_from_location_environment
       in_sub_process do
         RSpec.configuration.infer_spec_type_from_file_location!
diff --git a/spec/rspec/rails/example/channel_example_group_spec.rb b/spec/rspec/rails/example/channel_example_group_spec.rb
@@ -1,7 +1,7 @@
 require "rspec/rails/feature_check"
 
 module RSpec::Rails
-  RSpec.describe ChannelExampleGroup do
+  RSpec.describe ChannelExampleGroup, :with_isolated_config do
     if RSpec::Rails::FeatureCheck.has_action_cable_testing?
       it_behaves_like "an rspec-rails example group mixin", :channel,
                       './spec/channels/', '.\\spec\\channels\\'
diff --git a/spec/rspec/rails/example/controller_example_group_spec.rb b/spec/rspec/rails/example/controller_example_group_spec.rb
@@ -3,7 +3,7 @@ def self.abstract?; false; end
 end
 
 module RSpec::Rails
-  RSpec.describe ControllerExampleGroup do
+  RSpec.describe ControllerExampleGroup, :with_isolated_config do
     it_behaves_like "an rspec-rails example group mixin", :controller,
                     './spec/controllers/', '.\\spec\\controllers\\'
 
diff --git a/spec/rspec/rails/example/feature_example_group_spec.rb b/spec/rspec/rails/example/feature_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe FeatureExampleGroup do
+  RSpec.describe FeatureExampleGroup, :with_isolated_config do
     it_behaves_like "an rspec-rails example group mixin", :feature,
                     './spec/features/', '.\\spec\\features\\'
 
diff --git a/spec/rspec/rails/example/helper_example_group_spec.rb b/spec/rspec/rails/example/helper_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe HelperExampleGroup do
+  RSpec.describe HelperExampleGroup, :with_isolated_config do
     module ::FoosHelper
       class InternalClass
       end
diff --git a/spec/rspec/rails/example/job_example_group_spec.rb b/spec/rspec/rails/example/job_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe JobExampleGroup do
+  RSpec.describe JobExampleGroup, :with_isolated_config do
     if defined?(ActiveJob)
       it_behaves_like "an rspec-rails example group mixin", :job,
                       './spec/jobs/', '.\\spec\\jobs\\'
diff --git a/spec/rspec/rails/example/mailbox_example_group_spec.rb b/spec/rspec/rails/example/mailbox_example_group_spec.rb
@@ -14,7 +14,7 @@ def receive(*)
 
 module RSpec
   module Rails
-    RSpec.describe MailboxExampleGroup, skip: !RSpec::Rails::FeatureCheck.has_action_mailbox? do
+    RSpec.describe MailboxExampleGroup, :with_isolated_config, skip: !RSpec::Rails::FeatureCheck.has_action_mailbox? do
       it_behaves_like "an rspec-rails example group mixin", :mailbox,
                       './spec/mailboxes/', '.\\spec\\mailboxes\\'
 
diff --git a/spec/rspec/rails/example/mailer_example_group_spec.rb b/spec/rspec/rails/example/mailer_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe MailerExampleGroup do
+  RSpec.describe MailerExampleGroup, :with_isolated_config do
     module ::Rails; end
     before do
       allow(Rails).to receive_message_chain(:application, :routes, :url_helpers).and_return(Rails)
diff --git a/spec/rspec/rails/example/model_example_group_spec.rb b/spec/rspec/rails/example/model_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe ModelExampleGroup do
+  RSpec.describe ModelExampleGroup, :with_isolated_config do
     it_behaves_like "an rspec-rails example group mixin", :model,
                     './spec/models/', '.\\spec\\models\\'
   end
diff --git a/spec/rspec/rails/example/rails_example_group_spec.rb b/spec/rspec/rails/example/rails_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe RailsExampleGroup do
+  RSpec.describe RailsExampleGroup, :with_isolated_config do
     it 'supports tagged_logger' do
       expect(described_class.private_instance_methods).to include(:tagged_logger)
     end
diff --git a/spec/rspec/rails/example/request_example_group_spec.rb b/spec/rspec/rails/example/request_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe RequestExampleGroup do
+  RSpec.describe RequestExampleGroup, :with_isolated_config do
     it_behaves_like "an rspec-rails example group mixin", :request,
                     './spec/requests/', '.\\spec\\requests\\',
                     './spec/integration/', '.\\spec\\integration\\',
diff --git a/spec/rspec/rails/example/routing_example_group_spec.rb b/spec/rspec/rails/example/routing_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe RoutingExampleGroup do
+  RSpec.describe RoutingExampleGroup, :with_isolated_config do
     it_behaves_like "an rspec-rails example group mixin", :routing,
                     './spec/routing/', '.\\spec\\routing\\'
 
diff --git a/spec/rspec/rails/example/system_example_group_spec.rb b/spec/rspec/rails/example/system_example_group_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe SystemExampleGroup do
+  RSpec.describe SystemExampleGroup, :with_isolated_config do
     it_behaves_like "an rspec-rails example group mixin", :system,
                     './spec/system/', '.\\spec\\system\\'
 
diff --git a/spec/rspec/rails/example/view_example_group_spec.rb b/spec/rspec/rails/example/view_example_group_spec.rb
@@ -1,7 +1,7 @@
 require 'support/group_failure_formatter'
 
 module RSpec::Rails
-  RSpec.describe ViewExampleGroup do
+  RSpec.describe ViewExampleGroup, :with_isolated_config do
     it_behaves_like "an rspec-rails example group mixin", :view,
                     './spec/views/', '.\\spec\\views\\'
 
diff --git a/spec/rspec/rails/fixture_file_upload_support_spec.rb b/spec/rspec/rails/fixture_file_upload_support_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe FixtureFileUploadSupport do
+  RSpec.describe FixtureFileUploadSupport, :with_isolated_config do
     context 'with fixture paths set in config' do
       it 'resolves fixture file' do
         RSpec.configuration.fixture_paths = [File.dirname(__FILE__)]
diff --git a/spec/rspec/rails/fixture_support_spec.rb b/spec/rspec/rails/fixture_support_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe FixtureSupport do
+  RSpec.describe FixtureSupport, :with_isolated_config do
     context "with use_transactional_fixtures set to false" do
       it "still supports fixture_path/fixture_paths" do
         allow(RSpec.configuration).to receive(:use_transactional_fixtures) { false }
diff --git a/spec/rspec/rails/minitest_lifecycle_adapter_spec.rb b/spec/rspec/rails/minitest_lifecycle_adapter_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe RSpec::Rails::MinitestLifecycleAdapter do
+RSpec.describe RSpec::Rails::MinitestLifecycleAdapter, :with_isolated_config do
   it "invokes minitest lifecycle hooks at the appropriate times" do
     invocations = []
     example_group = RSpec::Core::ExampleGroup.describe("MinitestHooks") do
diff --git a/spec/rspec/rails/setup_and_teardown_adapter_spec.rb b/spec/rspec/rails/setup_and_teardown_adapter_spec.rb
@@ -1,4 +1,4 @@
-RSpec.describe RSpec::Rails::SetupAndTeardownAdapter do
+RSpec.describe RSpec::Rails::SetupAndTeardownAdapter, :with_isolated_config do
   describe ".setup" do
     it "registers before hooks in the order setup is received" do
       group = RSpec::Core::ExampleGroup.describe do
diff --git a/spec/rspec/rails/view_rendering_spec.rb b/spec/rspec/rails/view_rendering_spec.rb
@@ -1,5 +1,5 @@
 module RSpec::Rails
-  RSpec.describe ViewRendering do
+  RSpec.describe ViewRendering, :with_isolated_config do
     let(:group) do
       RSpec::Core::ExampleGroup.describe do
         def controller
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -71,10 +71,14 @@ def self.run_all(reporter = nil)
   config.warnings = true
   config.raise_on_warning = true
 
+  config.raise_errors_for_deprecations!
+
   # Execute a provided block with RSpec global objects (configuration,
   # world, current example) reset. This is used to test specs with RSpec.
-  config.around(:example) do |example|
+  config.around(:example, :with_isolated_config) do |example|
     RSpec::Core::Sandbox.sandboxed do |sandbox_config|
+      sandbox_config.raise_errors_for_deprecations! # Otherwise, deprecations are swallowed
+
       # If there is an example-within-an-example, we want to make sure the inner
       # example does not get a reference to the outer example (the real spec) if
       # it calls something like `pending`.
