diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 12:08:59 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 12:08:59 +0000 |
commit | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (patch) | |
tree | 651b5fca7ea0460e3ce7c687cfa9e3a3b37eefc8 /spec/lib/gitlab/ci/pipeline | |
parent | b4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (diff) | |
download | gitlab-ce-7351a484d79236b7e9d47c86f2fcc970b7ae10b0.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/ci/pipeline')
-rw-r--r-- | spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb b/spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb index 90f4b06cea0..c5c91135f60 100644 --- a/spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb +++ b/spec/lib/gitlab/ci/pipeline/seed/deployment_spec.rb @@ -33,13 +33,18 @@ describe Gitlab::Ci::Pipeline::Seed::Deployment do expect(subject.iid).to be_present expect(subject.environment.name).to eq('production') expect(subject.cluster).to be_nil + expect(subject.deployment_cluster).to be_nil end context 'when environment has deployment platform' do let!(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } - it 'returns a deployment with cluster id' do - expect(subject.cluster).to eq(cluster) + it 'sets the cluster and deployment_cluster' do + expect(subject.cluster).to eq(cluster) # until we stop double writing in 12.9: https://gitlab.com/gitlab-org/gitlab/issues/202628 + expect(subject.deployment_cluster).to have_attributes( + cluster_id: cluster.id, + kubernetes_namespace: subject.environment.deployment_namespace + ) end end |