Avoid using expect_any_instance_of

We can't use it for prepended module, so use `and_wrap_original` to wrap around the instance.

Avoid using expect_any_instance_of
ec31fa26 · Lin Jen-Shin · acdb7435 · ec31fa26
Commit ec31fa26 authored May 23, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

update_merge_requests_worker_spec.rb spec/workers/update_merge_requests_worker_spec.rb +7 -2

No files found.
--- a/spec/workers/update_merge_requests_worker_spec.rb
+++ b/spec/workers/update_merge_requests_worker_spec.rb
@@ -18,8 +18,13 @@ describe UpdateMergeRequestsWorker do
    end

    it 'executes MergeRequests::RefreshService with expected values' do
-      expect(MergeRequests::RefreshService).to receive(:new).with(project, user).and_call_original
-      expect_any_instance_of(MergeRequests::RefreshService).to receive(:execute).with(oldrev, newrev, ref)
+      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

      perform
    end