summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2019-07-01 04:25:52 +0000
committerLin Jen-Shin <godfat@godfat.org>2019-07-01 04:25:52 +0000
commitbc71d0b46164e8bcd4af78e5ce15261c8d796c52 (patch)
tree916092c65bcc99db69084b1bcf10dd072a300e34 /spec/factories
parent5ad09f38cceb7ee648206fd28c155a360cb64d31 (diff)
parent04af6132b14e594aeddef2a6d0c171af667c9539 (diff)
downloadgitlab-ce-bc71d0b46164e8bcd4af78e5ce15261c8d796c52.tar.gz
Merge branch 'add-clusters-to-deployment' into 'master'
Add clusters association to deployment See merge request gitlab-org/gitlab-ce!29960
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/deployments.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/deployments.rb b/spec/factories/deployments.rb
index db438ad32d3..1c7787bc1a6 100644
--- a/spec/factories/deployments.rb
+++ b/spec/factories/deployments.rb
@@ -22,6 +22,10 @@ FactoryBot.define do
ref 'pages-deploy'
end
+ trait :on_cluster do
+ cluster factory: %i(cluster provided_by_gcp)
+ end
+
trait :running do
status :running
end