Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/features/groups/clusters/user_spec.rb b/spec/features/groups/clusters/user_spec.rb
index 8891866c1f8..e06f2efe183 100644
--- a/spec/features/groups/clusters/user_spec.rb
+++ b/spec/features/groups/clusters/user_spec.rb
@@ -13,8 +13,12 @@ describe 'User Cluster', :js do
     gitlab_sign_in(user)
 
     allow(Groups::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 }
-    allow_any_instance_of(Clusters::Kubernetes::CreateOrUpdateNamespaceService).to receive(:execute)
-    allow_any_instance_of(Clusters::Cluster).to receive(:retrieve_connection_status).and_return(:connected)
+    allow_next_instance_of(Clusters::Kubernetes::CreateOrUpdateNamespaceService) do |instance|
+      allow(instance).to receive(:execute)
+    end
+    allow_next_instance_of(Clusters::Cluster) do |instance|
+      allow(instance).to receive(:retrieve_connection_status).and_return(:connected)
+    end
   end
 
   context 'when user does not have a cluster and visits cluster index page' do