Fix RequestStore-related test failuremk/backport-fix-safe-request-store-test

The test was failing
https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/101444126 because
https://gitlab.com/gitlab-org/gitlab-ee/blob/a04056efad6639420b469eced5130751a8cf2757/ee/spec/support/request_store.rb
which is in EE only, clears the RequestStore before every test,
regardless of whether RequestStore is active. This test is unusual
because it sets up RequestStore without it being active, to make sure
that the tested code doesn’t attempt to use RequestStore. These two
unusual facts combined to cause the failure in EE only. The fix works
because of the particular order of RSpec hooks in the test lifecycle.

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/lib/gitlab/safe_request_store_spec.rb b/spec/lib/gitlab/safe_request_store_spec.rb
index 27766fa0eda..c797171dbe2 100644
--- a/spec/lib/gitlab/safe_request_store_spec.rb
+++ b/spec/lib/gitlab/safe_request_store_spec.rb
@@ -219,11 +219,11 @@ describe Gitlab::SafeRequestStore do
     end
 
     context 'when RequestStore is NOT active' do
-      around do |example|
+      before do
         RequestStore.write('foo', true)
+      end
 
-        example.run
-
+      after do
         RequestStore.clear! # Clean up
       end