diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 15:06:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 15:06:34 +0300 |
| commit | cd4cb29b2c304f00d238ee72fe40c767cb3e2675 (patch) | |
| tree | 4dba0f038795f8d8f43ed807a1b7f58af27b61a9 /spec/services/issues | |
| parent | 2b339d4e892045d1d7be117d1557a5394ebd6e72 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services/issues')
| -rw-r--r-- | spec/services/issues/update_service_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb index 604befd7225..b8a0e118479 100644 --- a/spec/services/issues/update_service_spec.rb +++ b/spec/services/issues/update_service_spec.rb @@ -689,8 +689,9 @@ describe Issues::UpdateService, :mailer do context 'valid canonical_issue_id' do it 'calls the duplicate service with both issues' do - expect_any_instance_of(Issues::DuplicateService) - .to receive(:execute).with(issue, canonical_issue) + expect_next_instance_of(Issues::DuplicateService) do |service| + expect(service).to receive(:execute).with(issue, canonical_issue) + end update_issue(canonical_issue_id: canonical_issue.id) end |