diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-06-14 16:04:44 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-06-21 11:32:07 +0300 |
| commit | 562f357ba5cf59f8325a87b9fba178e4c9830ad5 (patch) | |
| tree | 7e35c58c3296497e5f3f34dd9c727c4c57b91c87 /spec/workers/update_merge_requests_worker_spec.rb | |
| parent | 7c11ed8c916a10f6d9c32635986008b48410531f (diff) | |
Implement `expect_next_instance_of` and use it
We need this because `expect_any_instance_of` doesn't work on
prepended models. Now we could use the same code between CE/EE
Diffstat (limited to 'spec/workers/update_merge_requests_worker_spec.rb')
| -rw-r--r-- | spec/workers/update_merge_requests_worker_spec.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/spec/workers/update_merge_requests_worker_spec.rb b/spec/workers/update_merge_requests_worker_spec.rb index 80137815d2b..0b553db0ca4 100644 --- a/spec/workers/update_merge_requests_worker_spec.rb +++ b/spec/workers/update_merge_requests_worker_spec.rb @@ -18,13 +18,9 @@ describe UpdateMergeRequestsWorker do end it 'executes MergeRequests::RefreshService with expected values' do - expect(MergeRequests::RefreshService).to receive(:new) - .with(project, user).and_wrap_original do |method, *args| - method.call(*args).tap do |refresh_service| - expect(refresh_service) - .to receive(:execute).with(oldrev, newrev, ref) - end - end + expect_next_instance_of(MergeRequests::RefreshService, project, user) do |refresh_service| + expect(refresh_service).to receive(:execute).with(oldrev, newrev, ref) + end perform end |