Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2019-06-24 04:46:21 +0300
committerThong Kuah <tkuah@gitlab.com>2019-06-24 07:59:22 +0300
commitee18ca2fa590453b42c7cba28c334d1327aa8b33 (patch)
tree8bc2d3bd19b47e33721712825aed8f61d02703bb /spec
parent25adee56f76ec6e0faca1dc4d7fef36e88c19f3d (diff)
Rename method to not clash with #cluster
We will introduce #cluster at a later stage. Also deprecate this method
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb8
-rw-r--r--spec/models/deployment_spec.rb4
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb b/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
index 5ac5122e800..5da414dd629 100644
--- a/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
+++ b/spec/lib/gitlab/ci/build/prerequisite/kubernetes_namespace_spec.rb
@@ -23,7 +23,7 @@ describe Gitlab::Ci::Build::Prerequisite::KubernetesNamespace do
let(:cluster) { create(:cluster, :group) }
before do
- allow(build.deployment).to receive(:cluster).and_return(cluster)
+ allow(build.deployment).to receive(:deployment_platform_cluster).and_return(cluster)
end
it { is_expected.to be_truthy }
@@ -55,7 +55,7 @@ describe Gitlab::Ci::Build::Prerequisite::KubernetesNamespace do
context 'and no cluster to deploy to' do
before do
- expect(deployment.cluster).to be_nil
+ expect(deployment.deployment_platform_cluster).to be_nil
end
it { is_expected.to be_falsey }
@@ -73,7 +73,7 @@ describe Gitlab::Ci::Build::Prerequisite::KubernetesNamespace do
let(:cluster) { create(:cluster, :group) }
before do
- allow(build.deployment).to receive(:cluster).and_return(cluster)
+ allow(build.deployment).to receive(:deployment_platform_cluster).and_return(cluster)
end
it 'creates a kubernetes namespace' do
@@ -90,7 +90,7 @@ describe Gitlab::Ci::Build::Prerequisite::KubernetesNamespace do
context 'completion is not required' do
before do
- expect(deployment.cluster).to be_nil
+ expect(deployment.deployment_platform_cluster).to be_nil
end
it 'does not create a namespace' do
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index 1dceef3fc00..a433878f3bc 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -380,12 +380,12 @@ describe Deployment do
end
end
- describe '#cluster' do
+ describe '#deployment_platform_cluster' do
let(:deployment) { create(:deployment) }
let(:project) { deployment.project }
let(:environment) { deployment.environment }
- subject { deployment.cluster }
+ subject { deployment.deployment_platform_cluster }
before do
expect(project).to receive(:deployment_platform)