1 files changed, 57 insertions, 52 deletions

diff --git a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb
index 98350fb9b8e..4d12e4b3f6f 100644
--- a/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb
+++ b/spec/lib/gitlab/sidekiq_middleware/duplicate_jobs/client_spec.rb
@@ -3,79 +3,84 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::SidekiqMiddleware::DuplicateJobs::Client, :clean_gitlab_redis_queues do
-  let(:worker_class) do
-    Class.new do
-      def self.name
-        'TestDeduplicationWorker'
-      end
+  shared_context 'deduplication worker class' do |strategy, including_scheduled|
+    let(:worker_class) do
+      Class.new do
+        def self.name
+          'TestDeduplicationWorker'
+        end
+
+        include ApplicationWorker
+
+        deduplicate strategy, including_scheduled: including_scheduled
 
-      include ApplicationWorker
+        include ApplicationWorker
 
-      def perform(*args)
+        def perform(*args)
+        end
       end
     end
-  end
 
-  before do
-    stub_const('TestDeduplicationWorker', worker_class)
+    before do
+      stub_const('TestDeduplicationWorker', worker_class)
+    end
   end
 
-  describe '#call' do
-    it 'adds a correct duplicate tag to the jobs', :aggregate_failures do
-      TestDeduplicationWorker.bulk_perform_async([['args1'], ['args2'], ['args1']])
+  shared_examples 'client duplicate job' do |strategy|
+    describe '#call' do
+      include_context 'deduplication worker class', strategy, false
 
-      job1, job2, job3 = TestDeduplicationWorker.jobs
-
-      expect(job1['duplicate-of']).to be_nil
-      expect(job2['duplicate-of']).to be_nil
-      expect(job3['duplicate-of']).to eq(job1['jid'])
-    end
-
-    context 'without scheduled deduplication' do
-      it "does not mark a job that's scheduled in the future as a duplicate" do
-        TestDeduplicationWorker.perform_async('args1')
-        TestDeduplicationWorker.perform_at(1.day.from_now, 'args1')
-        TestDeduplicationWorker.perform_in(3.hours, 'args1')
+      it 'adds a correct duplicate tag to the jobs', :aggregate_failures do
+        TestDeduplicationWorker.bulk_perform_async([['args1'], ['args2'], ['args1']])
 
-        duplicates = TestDeduplicationWorker.jobs.map { |job| job['duplicate-of'] }
+        job1, job2, job3 = TestDeduplicationWorker.jobs
 
-        expect(duplicates).to all(be_nil)
+        expect(job1['duplicate-of']).to be_nil
+        expect(job2['duplicate-of']).to be_nil
+        expect(job3['duplicate-of']).to eq(job1['jid'])
       end
-    end
-
-    context 'with scheduled deduplication' do
-      let(:scheduled_worker_class) do
-        Class.new do
-          def self.name
-            'TestDeduplicationWorker'
-          end
 
-          include ApplicationWorker
+      context 'without scheduled deduplication' do
+        it "does not mark a job that's scheduled in the future as a duplicate" do
+          TestDeduplicationWorker.perform_async('args1')
+          TestDeduplicationWorker.perform_at(1.day.from_now, 'args1')
+          TestDeduplicationWorker.perform_in(3.hours, 'args1')
 
-          deduplicate :until_executing, including_scheduled: true
+          duplicates = TestDeduplicationWorker.jobs.map { |job| job['duplicate-of'] }
 
-          def perform(*args)
-          end
+          expect(duplicates).to all(be_nil)
         end
       end
 
-      before do
-        stub_const('TestDeduplicationWorker', scheduled_worker_class)
-      end
+      context 'with scheduled deduplication' do
+        include_context 'deduplication worker class', strategy, true
 
-      it 'adds a correct duplicate tag to the jobs', :aggregate_failures do
-        TestDeduplicationWorker.perform_async('args1')
-        TestDeduplicationWorker.perform_at(1.day.from_now, 'args1')
-        TestDeduplicationWorker.perform_in(3.hours, 'args1')
-        TestDeduplicationWorker.perform_in(3.hours, 'args2')
+        before do
+          stub_const('TestDeduplicationWorker', worker_class)
+        end
 
-        job1, job2, job3, job4 = TestDeduplicationWorker.jobs
+        it 'adds a correct duplicate tag to the jobs', :aggregate_failures do
+          TestDeduplicationWorker.perform_async('args1')
+          TestDeduplicationWorker.perform_at(1.day.from_now, 'args1')
+          TestDeduplicationWorker.perform_in(3.hours, 'args1')
+          TestDeduplicationWorker.perform_in(3.hours, 'args2')
 
-        expect(job1['duplicate-of']).to be_nil
-        expect(job2['duplicate-of']).to eq(job1['jid'])
-        expect(job3['duplicate-of']).to eq(job1['jid'])
-        expect(job4['duplicate-of']).to be_nil
+          job1, job2, job3, job4 = TestDeduplicationWorker.jobs
+
+          expect(job1['duplicate-of']).to be_nil
+          expect(job2['duplicate-of']).to eq(job1['jid'])
+          expect(job3['duplicate-of']).to eq(job1['jid'])
+          expect(job4['duplicate-of']).to be_nil
+        end
       end
     end
   end
+
+  context 'with until_executing strategy' do
+    it_behaves_like 'client duplicate job', :until_executing
+  end
+
+  context 'with until_executed strategy' do
+    it_behaves_like 'client duplicate job', :until_executed
+  end
 end