Rework reset behaviour of ActiveSupport::CurrentAttributes

lib/rspec/rails/adapters.rb

@@ -136,6 +136,24 @@ def method_name
       end
     end
 
+    # @private
+    #
+    # Reset ActiveSupport::CurrentAttributes only *after* tests run, rather
+    # than before *and* after.
+    #
+    # See https://github.com/rspec/rspec-rails/pull/2774 for more details.
+    #
+    module ActiveSupportCurrentAttributesAdapter
+      extend ActiveSupport::Concern
+
+      included do
+        def after_teardown
+          super
+          ActiveSupport::CurrentAttributes.reset_all
+        end
+      end
+    end
+
     # @private
     module MinitestAssertionAdapter
       extend ActiveSupport::Concern

lib/rspec/rails/example/rails_example_group.rb

@@ -19,7 +19,7 @@ module RailsExampleGroup
       include RSpec::Rails::FixtureSupport
       if ::Rails::VERSION::MAJOR >= 7
         include RSpec::Rails::TaggedLoggingAdapter
-        include ActiveSupport::CurrentAttributes::TestHelper
+        include RSpec::Rails::ActiveSupportCurrentAttributesAdapter
         include ActiveSupport::ExecutionContext::TestHelper
       end
     end

spec/rspec/rails/example/rails_example_group_spec.rb

@@ -1,3 +1,5 @@
+require 'rspec/support/spec/in_sub_process'
+
 module RSpec::Rails
   RSpec.describe RailsExampleGroup do
     it 'supports tagged_logger', if: ::Rails::VERSION::MAJOR >= 7 do
@@ -56,5 +58,81 @@ class CurrentSample < ActiveSupport::CurrentAttributes
         group.run(failure_reporter) ? true : failure_reporter.exceptions
       ).to be true
     end
+
+    context 'with suite-level around-example hooks configured', if: ::Rails::VERSION::MAJOR >= 7 do
+      let(:uniquely_identifiable_metadata) do
+        { configured_around_example_hook: true }
+      end
+
+      # rubocop:disable Lint/ConstantDefinitionInBlock
+      class CurrentAttrsBetweenHooks < ActiveSupport::CurrentAttributes
+        attribute :request_id
+      end
+      # rubocop:enable Lint/ConstantDefinitionInBlock
+
+      # This dirties global state, so tests *MUST* remember to use
+      # "in_sub_process".
+      #
+      before :each do
+
+        # Client code might legitimately want to wrap examples to ensure
+        # all-conditions tidy-up, e.g. "ActsAsTenant.without_tenant do...",
+        # wherein an "around" hook is the only available solution, often used
+        # in the overall suite via "config.around". Tests would not expect
+        # anything set in CurrentAttributes here to suddenly be reset by the
+        # time their actual tests, or their test hooks ran.
+        #
+        RSpec.configure do | config |
+          config.around(:each, uniquely_identifiable_metadata) do | example |
+            CurrentAttrsBetweenHooks.request_id = '123'
+            example.run
+          end
+        end
+      end
+
+      it 'does not reset ActiveSupport::CurrentAttributes before examples' do
+        in_sub_process do
+          group =
+            RSpec::Core::ExampleGroup.describe('A group', uniquely_identifiable_metadata) do
+              include RSpec::Rails::RailsExampleGroup
+
+              it 'runs normally' do
+                expect(CurrentAttrsBetweenHooks.request_id).to eq('123')
+              end
+            end
+
+          expect(
+            group.run(failure_reporter) ? true : failure_reporter.exceptions
+          ).to be true
+        end
+      end
+
+      it 'does not reset ActiveSupport::CurrentAttributes before before-each hooks' do
+        in_sub_process do
+          group =
+            RSpec::Core::ExampleGroup.describe('A group', uniquely_identifiable_metadata) do
+              include RSpec::Rails::RailsExampleGroup
+
+              # Client code will often have test setup blocks within "*_spec.rb"
+              # files that might set up data or other environmental factors for a
+              # group of tests in e.g. a "before" hook, but would reasonably expect
+              # suite-wide 'around' settings to remain intact and not be reset.
+              #
+              before :each do
+                expect(CurrentAttrsBetweenHooks.request_id).to eq('123')
+                CurrentAttrsBetweenHooks.request_id = '234'
+              end
+
+              it 'runs normally' do
+                expect(CurrentAttrsBetweenHooks.request_id).to eq('234')
+              end
+            end
+
+          expect(
+            group.run(failure_reporter) ? true : failure_reporter.exceptions
+          ).to be true
+        end
+      end
+    end
   end
 end