From 1219a9dce91f4edbc135dfc08299b4122b4825a8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 1 Apr 2020 15:07:45 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/services/users/activity_service_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/services/users') diff --git a/spec/services/users/activity_service_spec.rb b/spec/services/users/activity_service_spec.rb index f477eee1dd6..5f068a2033c 100644 --- a/spec/services/users/activity_service_spec.rb +++ b/spec/services/users/activity_service_spec.rb @@ -30,7 +30,7 @@ describe Users::ActivityService do end it 'tries to obtain ExclusiveLease' do - expect(Gitlab::ExclusiveLease).to receive(:new).and_call_original + expect(Gitlab::ExclusiveLease).to receive(:new).with("activity_service:#{user.id}", anything).and_call_original subject.execute end @@ -56,7 +56,7 @@ describe Users::ActivityService do end it 'does not try to obtain ExclusiveLease' do - expect(Gitlab::ExclusiveLease).not_to receive(:new) + expect(Gitlab::ExclusiveLease).not_to receive(:new).with("activity_service:#{user.id}", anything) subject.execute end -- cgit v1.2.1