summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-07 18:34:59 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-07 18:34:59 +0900
commitd89d514e89916a08b2692ada242afc732d10fdc0 (patch)
tree2e69d464f6b3d03f8177ee0c3bd0bb85a1af1e46 /spec/factories
parent6228b65ff1503e2a3496544c15961139e1fb6cd4 (diff)
parent3bf2abaa1cc26b8658d870e85d4fc9e60e621944 (diff)
downloadgitlab-ce-d89d514e89916a08b2692ada242afc732d10fdc0.tar.gz
Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into 38464-k8s-apps
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/clusters/applications/helm.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb
index fd956097115..b63e26125d1 100644
--- a/spec/factories/clusters/applications/helm.rb
+++ b/spec/factories/clusters/applications/helm.rb
@@ -1,10 +1,6 @@
FactoryGirl.define do
- factory :applications_helm, class: Clusters::Applications::Helm do
- trait :cluster do
- before(:create) do |app, _|
- app.cluster = create(:cluster)
- end
- end
+ factory :cluster_applications_helm, class: Clusters::Applications::Helm do
+ cluster factory: :cluster
trait :installable do
cluster