Refactor spec for current attributes

Author: JonRowe

spec/rspec/rails/example/rails_example_group_spec.rb

@@ -1,13 +1,7 @@
 module RSpec::Rails
   RSpec.describe RailsExampleGroup do
-    if ::Rails::VERSION::MAJOR >= 7
-      class CurrentSample < ActiveSupport::CurrentAttributes
-        attribute :request_id
-      end
-
-      it 'supports tagged_logger' do
-        expect(described_class.private_instance_methods).to include(:tagged_logger)
-      end
+    it 'supports tagged_logger', if: ::Rails::VERSION::MAJOR >= 7 do
+      expect(described_class.private_instance_methods).to include(:tagged_logger)
     end
 
     it 'does not leak context between example groups', if: ::Rails::VERSION::MAJOR >= 7 do
@@ -37,17 +31,28 @@ class CurrentSample < ActiveSupport::CurrentAttributes
       expect(results).to all be true
     end
 
-    describe 'CurrentAttributes', order: :defined, if: ::Rails::VERSION::MAJOR >= 7 do
-      include RSpec::Rails::RailsExampleGroup
+    it 'will not leak ActiveSupport::CurrentAttributes between examples', if: ::Rails::VERSION::MAJOR >= 7 do
+      group =
+        RSpec::Core::ExampleGroup.describe("A group", order: :defined) do
+          include RSpec::Rails::RailsExampleGroup
 
-      it 'sets a current attribute' do
-        CurrentSample.request_id = '123'
-        expect(CurrentSample.request_id).to eq('123')
-      end
+          class CurrentSample < ActiveSupport::CurrentAttributes
+            attribute :request_id
+          end
+
+          it 'sets a current attribute' do
+            CurrentSample.request_id = '123'
+            expect(CurrentSample.request_id).to eq('123')
+          end
+
+          it 'does not leak current attributes' do
+            expect(CurrentSample.request_id).to eq(nil)
+          end
+        end
 
-      it 'does not leak current attributes' do
-        expect(CurrentSample.request_id).to eq(nil)
-      end
+      expect(
+        group.run(failure_reporter) ? true : failure_reporter.exceptions
+      ).to be true
     end
   end
 end