Work around limitations of expect_any_instance_of by stubbing Project.find

3 files changed, 23 insertions, 9 deletions

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index d385d617731..adb6ea94ac7 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1726,7 +1726,11 @@ describe Project do
         .with(project.repository_storage, project.disk_path, project.import_url)
         .and_return(true)
 
-      expect_any_instance_of(Repository).to receive(:after_import)
+      # Works around https://github.com/rspec/rspec-mocks/issues/910
+      expect(Project).to receive(:find).with(project.id).twice.and_return(project)
+      expect(project.repository).to receive(:after_import)
+        .and_call_original
+      expect(project.wiki.repository).to receive(:after_import)
         .and_call_original
     end
 
diff --git a/spec/workers/repository_fork_worker_spec.rb b/spec/workers/repository_fork_worker_spec.rb
index 4b3c1736ea0..ae4786389c7 100644
--- a/spec/workers/repository_fork_worker_spec.rb
+++ b/spec/workers/repository_fork_worker_spec.rb
@@ -55,10 +55,15 @@ describe RepositoryForkWorker do
       it 'flushes various caches' do
         expect_fork_repository.and_return(true)
 
-        expect_any_instance_of(Repository).to receive(:expire_emptiness_caches)
+        # Works around https://github.com/rspec/rspec-mocks/issues/910
+        expect(Project).to receive(:find).with(fork_project.id).and_return(fork_project)
+        expect(fork_project.repository).to receive(:expire_emptiness_caches)
           .and_call_original
-
-        expect_any_instance_of(Repository).to receive(:expire_exists_cache)
+        expect(fork_project.repository).to receive(:expire_exists_cache)
+          .and_call_original
+        expect(fork_project.wiki.repository).to receive(:expire_emptiness_caches)
+          .and_call_original
+        expect(fork_project.wiki.repository).to receive(:expire_exists_cache)
           .and_call_original
 
         perform!
diff --git a/spec/workers/repository_import_worker_spec.rb b/spec/workers/repository_import_worker_spec.rb
index 84d1b38ef19..f0884ad0aff 100644
--- a/spec/workers/repository_import_worker_spec.rb
+++ b/spec/workers/repository_import_worker_spec.rb
@@ -22,8 +22,11 @@ describe RepositoryImportWorker do
         expect_any_instance_of(Projects::ImportService).to receive(:execute)
           .and_return({ status: :ok })
 
-        expect_any_instance_of(Repository).to receive(:expire_emptiness_caches)
-        expect_any_instance_of(Project).to receive(:import_finish)
+        # Works around https://github.com/rspec/rspec-mocks/issues/910
+        expect(Project).to receive(:find).with(project.id).and_return(project)
+        expect(project.repository).to receive(:expire_emptiness_caches)
+        expect(project.wiki.repository).to receive(:expire_emptiness_caches)
+        expect(project).to receive(:import_finish)
 
         subject.perform(project.id)
       end
@@ -34,9 +37,11 @@ describe RepositoryImportWorker do
         expect_any_instance_of(Projects::ImportService).to receive(:execute)
           .and_return({ status: :ok })
 
-        expect_any_instance_of(Project).to receive(:after_import).and_call_original
-        expect_any_instance_of(Repository).to receive(:expire_emptiness_caches)
-        expect_any_instance_of(Project).to receive(:import_finish)
+        # Works around https://github.com/rspec/rspec-mocks/issues/910
+        expect(Project).to receive(:find).with(project.id).and_return(project)
+        expect(project.repository).to receive(:expire_emptiness_caches)
+        expect(project.wiki.repository).to receive(:expire_emptiness_caches)
+        expect(project).to receive(:import_finish)
 
         subject.perform(project.id)
       end