Add latest changes from gitlab-org/gitlab@master

1 files changed, 13 insertions, 5 deletions

diff --git a/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb b/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb
index f9914a7cecb..650be1e84a9 100644
--- a/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb
+++ b/spec/workers/ci/resource_groups/assign_resource_from_resource_group_worker_spec.rb
@@ -5,15 +5,23 @@ require 'spec_helper'
 RSpec.describe Ci::ResourceGroups::AssignResourceFromResourceGroupWorker do
   let(:worker) { described_class.new }
 
+  it 'has the `until_executed` deduplicate strategy' do
+    expect(described_class.get_deduplicate_strategy).to eq(:until_executed)
+  end
+
   describe '#perform' do
     subject { worker.perform(resource_group_id) }
 
-    context 'when resource group exists' do
-      let(:resource_group) { create(:ci_resource_group) }
-      let(:resource_group_id) { resource_group.id }
+    let(:resource_group) { create(:ci_resource_group) }
+    let(:resource_group_id) { resource_group.id }
 
+    include_examples 'an idempotent worker' do
+      let(:job_args) { [resource_group_id] }
+    end
+
+    context 'when resource group exists' do
       it 'executes AssignResourceFromResourceGroupService' do
-        expect_next_instance_of(Ci::ResourceGroups::AssignResourceFromResourceGroupService, resource_group.project, nil) do |service|
+        expect_next_instances_of(Ci::ResourceGroups::AssignResourceFromResourceGroupService, 2, resource_group.project, nil) do |service|
           expect(service).to receive(:execute).with(resource_group)
         end
 
@@ -22,7 +30,7 @@ RSpec.describe Ci::ResourceGroups::AssignResourceFromResourceGroupWorker do
     end
 
     context 'when build does not exist' do
-      let(:resource_group_id) { 123 }
+      let(:resource_group_id) { non_existing_record_id }
 
       it 'does not execute AssignResourceFromResourceGroupService' do
         expect(Ci::ResourceGroups::AssignResourceFromResourceGroupService).not_to receive(:new)