Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 3 deletions

diff --git a/spec/workers/repository_remove_remote_worker_spec.rb b/spec/workers/repository_remove_remote_worker_spec.rb
index 7d66131f34e..758f7f75e03 100644
--- a/spec/workers/repository_remove_remote_worker_spec.rb
+++ b/spec/workers/repository_remove_remote_worker_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe RepositoryRemoveRemoteWorker do
 
         expect(subject)
           .to receive(:log_error)
-          .with("Cannot obtain an exclusive lease for #{subject.class.name}. There must be another instance already in execution.")
+          .with("Cannot obtain an exclusive lease for #{lease_key}. There must be another instance already in execution.")
 
         subject.perform(project.id, remote_name)
       end
diff --git a/spec/workers/repository_update_remote_mirror_worker_spec.rb b/spec/workers/repository_update_remote_mirror_worker_spec.rb
index 858f5226c48..ef6a8d76d2c 100644
--- a/spec/workers/repository_update_remote_mirror_worker_spec.rb
+++ b/spec/workers/repository_update_remote_mirror_worker_spec.rb
@@ -3,9 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe RepositoryUpdateRemoteMirrorWorker, :clean_gitlab_redis_shared_state do
-  subject { described_class.new }
+  let_it_be(:remote_mirror) { create(:remote_mirror) }
 
-  let(:remote_mirror) { create(:remote_mirror) }
   let(:scheduled_time) { Time.current - 5.minutes }
 
   around do |example|
@@ -19,6 +18,8 @@ RSpec.describe RepositoryUpdateRemoteMirrorWorker, :clean_gitlab_redis_shared_st
   end
 
   describe '#perform' do
+    subject { described_class.new }
+
     it 'calls out to the service to perform the update' do
       expect_mirror_service_to_return(remote_mirror, status: :success)
 
@@ -68,4 +69,8 @@ RSpec.describe RepositoryUpdateRemoteMirrorWorker, :clean_gitlab_redis_shared_st
       subject.perform(remote_mirror.id, scheduled_time)
     end
   end
+
+  include_examples 'an idempotent worker' do
+    let(:job_args) { [remote_mirror.id, scheduled_time] }
+  end
 end