diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 21:24:28 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 21:24:28 +0900 |
commit | b982a44abb53835276739d77f7fedc69d36c3dab (patch) | |
tree | 3f917e5f73be29bbba50a32d787fd6e1a61e450a /spec/factories | |
parent | bbdb0cf05141cdf9931e2aa673bf7a2ce5db0078 (diff) | |
parent | 68a9229502de26c191dbd56738828736876217f6 (diff) | |
download | gitlab-ce-b982a44abb53835276739d77f7fedc69d36c3dab.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.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/spec/factories/clusters/applications/helm.rb b/spec/factories/clusters/applications/helm.rb index b63e26125d1..23818f19edf 100644 --- a/spec/factories/clusters/applications/helm.rb +++ b/spec/factories/clusters/applications/helm.rb @@ -1,29 +1,24 @@ FactoryGirl.define do factory :cluster_applications_helm, class: Clusters::Applications::Helm do - cluster factory: :cluster + cluster factory: %i(cluster provided_by_gcp) trait :installable do - cluster status 0 end trait :scheduled do - cluster status 1 end trait :installing do - cluster status 2 end trait :installed do - cluster status 3 end trait :errored do - cluster status(-1) status_reason 'something went wrong' end |