Merge branch 'bvl-cleanup-request-store-metadata-in-specs' into 'master'

Remove duplicated with_request_store spec-metadata

See merge request gitlab-org/gitlab!24082

ee/app/models/geo_node.rb

@@ -63,14 +63,14 @@ class GeoNode < ApplicationRecord
   class << self
     # Set in gitlab.rb as external_url
     def current_node_url
-      RequestStore.fetch('geo_node:current_node_url') do
+      Gitlab::SafeRequestStore.fetch('geo_node:current_node_url') do
         Gitlab.config.gitlab.url
       end
     end
 
     # Set in gitlab.rb as geo_node_name
     def current_node_name
-      RequestStore.fetch('geo_node:current_node_name') do
+      Gitlab::SafeRequestStore.fetch('geo_node:current_node_name') do
         Gitlab.config.geo.node_name
       end
     end

ee/spec/models/geo_node_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe GeoNode, :geo, type: :model do
+describe GeoNode, :request_store, :geo, type: :model do
   using RSpec::Parameterized::TableSyntax
   include ::EE::GeoHelpers
 

ee/spec/requests/api/geo_nodes_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::GeoNodes, :geo, :prometheus, api: true do
+describe API::GeoNodes, :request_store, :geo, :prometheus, api: true do
   include ApiHelpers
   include ::EE::GeoHelpers
 

ee/spec/requests/api/geo_replication_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe API::GeoReplication, :geo, :geo_fdw, api: true do
+describe API::GeoReplication, :request_store, :geo, :geo_fdw, api: true do
   include ApiHelpers
   include ::EE::GeoHelpers
 

ee/spec/requests/security/vulnerability_findings_spec.rb

@@ -187,7 +187,7 @@ describe 'GET /-/security/vulnerability_findings' do
                project_fingerprint: vulnerability.project_fingerprint)
       end
 
-      it 'avoids N+1 queries', :with_request_store do
+      it 'avoids N+1 queries', :request_store do
         control_count = ActiveRecord::QueryRecorder.new { subject }
 
         vulnerability = create(:vulnerabilities_occurrence, pipelines: [pipeline], project: project, report_type: :sast)

ee/spec/support/request_store.rb

-# frozen_string_literal: true
-
-RSpec.configure do |config|
-  config.before do
-    RequestStore.clear!
-  end
-
-  config.around(:each, :with_request_store) do |example|
-    RequestStore.begin!
-    example.run
-    RequestStore.end!
-  end
-end

ee/spec/support/shared_examples/controllers/concerns/project_vulnerability_findings_actions_shared_examples.rb

@@ -68,7 +68,7 @@ RSpec.shared_examples ProjectVulnerabilityFindingsActions do
                 project_fingerprint: vulnerability.project_fingerprint)
       end
 
-      it 'avoids N+1 queries', :with_request_store do
+      it 'avoids N+1 queries', :request_store do
         control_count = ActiveRecord::QueryRecorder.new { subject }
 
         vulnerability = create(:vulnerabilities_occurrence, pipelines: [pipeline], project: vulnerable_project, report_type: :sast)

spec/lib/gitlab/safe_request_store_spec.rb

@@ -38,7 +38,7 @@ describe Gitlab::SafeRequestStore do
   describe '.clear!' do
     context 'when RequestStore is active', :request_store do
       it 'uses RequestStore' do
-        expect(RequestStore).to receive(:clear!).twice.and_call_original
+        expect(RequestStore).to receive(:clear!).once.and_call_original
 
         described_class.clear!
       end
@@ -56,7 +56,7 @@ describe Gitlab::SafeRequestStore do
   describe '.end!' do
     context 'when RequestStore is active', :request_store do
       it 'uses RequestStore' do
-        expect(RequestStore).to receive(:end!).twice.and_call_original
+        expect(RequestStore).to receive(:end!).once.and_call_original
 
         described_class.end!
       end

spec/spec_helper.rb

@@ -208,11 +208,11 @@ RSpec.configure do |config|
     example.run if config.inclusion_filter[:quarantine]
   end
 
-  config.before(:example, :request_store) do
+  config.around(:example, :request_store) do |example|
     RequestStore.begin!
-  end
 
-  config.after(:example, :request_store) do
+    example.run
+
     RequestStore.end!
     RequestStore.clear!
   end