Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

1 files changed, 5 insertions, 36 deletions

diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
index b6748d49739..6a515a2b8a5 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/duplicate_job_spec.rb
@@ -77,7 +77,11 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob, :clean_gi
     end
   end
 
-  shared_examples 'with Redis cookies' do
+  context 'with Redis cookies' do
+    def with_redis(&block)
+      Sidekiq.redis(&block)
+    end
+
     let(:cookie_key) { "#{idempotency_key}:cookie:v2" }
     let(:cookie) { get_redis_msgpack(cookie_key) }
 
@@ -385,41 +389,6 @@ RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::DuplicateJob, :clean_gi
     end
   end
 
-  context 'with multi-store feature flags turned on' do
-    def with_redis(&block)
-      Gitlab::Redis::DuplicateJobs.with(&block)
-    end
-
-    it 'use Gitlab::Redis::DuplicateJobs.with' do
-      expect(Gitlab::Redis::DuplicateJobs).to receive(:with).and_call_original
-      expect(Sidekiq).not_to receive(:redis)
-
-      duplicate_job.check!
-    end
-
-    it_behaves_like 'with Redis cookies'
-  end
-
-  context 'when both multi-store feature flags are off' do
-    def with_redis(&block)
-      Sidekiq.redis(&block)
-    end
-
-    before do
-      stub_feature_flags(use_primary_and_secondary_stores_for_duplicate_jobs: false)
-      stub_feature_flags(use_primary_store_as_default_for_duplicate_jobs: false)
-    end
-
-    it 'use Sidekiq.redis' do
-      expect(Sidekiq).to receive(:redis).and_call_original
-      expect(Gitlab::Redis::DuplicateJobs).not_to receive(:with)
-
-      duplicate_job.check!
-    end
-
-    it_behaves_like 'with Redis cookies'
-  end
-
   describe '#scheduled?' do
     it 'returns false for non-scheduled jobs' do
       expect(duplicate_job.scheduled?).to be(false)