summaryrefslogtreecommitdiff
path: root/spec/services/clusters
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-06-24 05:16:31 +0000
committerThong Kuah <tkuah@gitlab.com>2019-06-24 05:16:31 +0000
commitd9f4a919458721bd9ffae4d4e69bf17d18bd3be8 (patch)
tree04fe777f8eb643539cb4eceedeb54cb586947332 /spec/services/clusters
parent833013ba4a855d62cfbc691c3ba95e06876a1634 (diff)
parent74702f0e0e05bc346338fbd11b596fcbedfbaea6 (diff)
downloadgitlab-ce-d9f4a919458721bd9ffae4d4e69bf17d18bd3be8.tar.gz
Merge branch '60617-enable-project-cluster-jit' into 'master'
Enable JIT Kubernetes resource creation for project level clusters See merge request gitlab-org/gitlab-ce!29515
Diffstat (limited to 'spec/services/clusters')
-rw-r--r--spec/services/clusters/gcp/finalize_creation_service_spec.rb10
-rw-r--r--spec/services/clusters/update_service_spec.rb1
2 files changed, 0 insertions, 11 deletions
diff --git a/spec/services/clusters/gcp/finalize_creation_service_spec.rb b/spec/services/clusters/gcp/finalize_creation_service_spec.rb
index 2664649df47..5f91acb8e84 100644
--- a/spec/services/clusters/gcp/finalize_creation_service_spec.rb
+++ b/spec/services/clusters/gcp/finalize_creation_service_spec.rb
@@ -19,10 +19,6 @@ describe Clusters::Gcp::FinalizeCreationService, '#execute' do
subject { described_class.new.execute(provider) }
- before do
- allow(ClusterConfigureWorker).to receive(:perform_async)
- end
-
shared_examples 'success' do
it 'configures provider and kubernetes' do
subject
@@ -42,12 +38,6 @@ describe Clusters::Gcp::FinalizeCreationService, '#execute' do
expect(platform.password).to eq(password)
expect(platform.token).to eq(token)
end
-
- it 'calls ClusterConfigureWorker in a ascync fashion' do
- expect(ClusterConfigureWorker).to receive(:perform_async).with(cluster.id)
-
- subject
- end
end
shared_examples 'error' do
diff --git a/spec/services/clusters/update_service_spec.rb b/spec/services/clusters/update_service_spec.rb
index 21b37f88fd8..3ee45375dca 100644
--- a/spec/services/clusters/update_service_spec.rb
+++ b/spec/services/clusters/update_service_spec.rb
@@ -39,7 +39,6 @@ describe Clusters::UpdateService do
end
before do
- allow(ClusterConfigureWorker).to receive(:perform_async)
stub_kubeclient_get_namespace('https://kubernetes.example.com', namespace: 'my-namespace')
end