diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-09-01 22:26:00 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-09-01 22:26:00 +0000 |
| commit | 6d033c669b568930eac51d30210f18445d2ae5a0 (patch) | |
| tree | 018cd24853896df0aa2d7c43daf7dfbb50092053 /spec/features | |
| parent | 750a25cf2ffcb5e7f612dc9b0ae426cf28714f52 (diff) | |
| parent | 9e8daeb8a6066109c3254178fe689dc8066d88db (diff) | |
| download | gitlab-ce-66783-usage-ping-for-slack-integrations.tar.gz | |
Merge branch '46686-move-k8s-services-out-of-gcp-namespace' into 'master'66783-usage-ping-for-slack-integrations
Move generic k8s services out of GCP namespace
See merge request gitlab-org/gitlab-ce!32310
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/groups/clusters/user_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/projects/clusters/user_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/groups/clusters/user_spec.rb b/spec/features/groups/clusters/user_spec.rb index 84a8691a7f2..8891866c1f8 100644 --- a/spec/features/groups/clusters/user_spec.rb +++ b/spec/features/groups/clusters/user_spec.rb @@ -13,7 +13,7 @@ describe 'User Cluster', :js do gitlab_sign_in(user) allow(Groups::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 } - allow_any_instance_of(Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService).to receive(:execute) + allow_any_instance_of(Clusters::Kubernetes::CreateOrUpdateNamespaceService).to receive(:execute) allow_any_instance_of(Clusters::Cluster).to receive(:retrieve_connection_status).and_return(:connected) end diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb index 3899aab8170..84f2e3e09ae 100644 --- a/spec/features/projects/clusters/user_spec.rb +++ b/spec/features/projects/clusters/user_spec.rb @@ -13,7 +13,7 @@ describe 'User Cluster', :js do gitlab_sign_in(user) allow(Projects::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 } - allow_any_instance_of(Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService).to receive(:execute) + allow_any_instance_of(Clusters::Kubernetes::CreateOrUpdateNamespaceService).to receive(:execute) allow_any_instance_of(Clusters::Cluster).to receive(:retrieve_connection_status).and_return(:connected) end |