summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-06-24 22:23:18 +0000
committerStan Hu <stanhu@gmail.com>2019-06-24 22:23:18 +0000
commitdb9783f7826ed5ba58a8941dd80a1cd7dda517b0 (patch)
tree74834cc78180e1be10c3f48d12113771a305a380 /spec/models
parent30eb7448dec4e97e82a1be6ac011e3abe0e4cc0d (diff)
parentee18ca2fa590453b42c7cba28c334d1327aa8b33 (diff)
downloadgitlab-ce-db9783f7826ed5ba58a8941dd80a1cd7dda517b0.tar.gz
Merge branch 'refactor_deployment_cluster' into 'master'
Refactor Deployment#cluster to #deployment_platform_cluster See merge request gitlab-org/gitlab-ce!29961
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/deployment_spec.rb4
1 files changed, 2 insertions, 2 deletions
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)