diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-10-30 21:55:18 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-30 21:55:18 +0900 |
commit | d6744d98384192799c9b3a97ad0eaf69cb4d25ee (patch) | |
tree | 68cb8a8002448165c350c6556175ba57befabe3a /spec/factories | |
parent | 478e59fe8d82b99800a2613aa4d153bf692fbd6b (diff) | |
download | gitlab-ce-d6744d98384192799c9b3a97ad0eaf69cb4d25ee.tar.gz |
specs for services. Improved details.
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/clusters/cluster.rb | 14 | ||||
-rw-r--r-- | spec/factories/clusters/platforms/kubernetes.rb (renamed from spec/factories/clusters/providers/kubernetes.rb) | 13 | ||||
-rw-r--r-- | spec/factories/clusters/providers/gcp.rb (renamed from spec/factories/clusters/platforms/gcp.rb) | 4 |
3 files changed, 24 insertions, 7 deletions
diff --git a/spec/factories/clusters/cluster.rb b/spec/factories/clusters/cluster.rb index 8ba1eda8cc9..ad116ecfa16 100644 --- a/spec/factories/clusters/cluster.rb +++ b/spec/factories/clusters/cluster.rb @@ -14,13 +14,19 @@ FactoryGirl.define do trait :provided_by_user do provider_type :user platform_type :kubernetes - platform_kubernetes + + platform_kubernetes do + create(:platform_kubernetes, :configured) + end end trait :provided_by_gcp do provider_type :gcp platform_type :kubernetes - platform_kubernetes + + platform_kubernetes do + create(:platform_kubernetes, :configured) + end provider_gcp do create(:provider_gcp, :created) @@ -34,6 +40,10 @@ FactoryGirl.define do provider_gcp do create(:provider_gcp, :creating) end + + after(:create) do |cluster, evaluator| + create(:platform_kubernetes, cluster: cluster) + end end end end diff --git a/spec/factories/clusters/providers/kubernetes.rb b/spec/factories/clusters/platforms/kubernetes.rb index b4d413d32c1..69c2f30f859 100644 --- a/spec/factories/clusters/providers/kubernetes.rb +++ b/spec/factories/clusters/platforms/kubernetes.rb @@ -1,11 +1,6 @@ FactoryGirl.define do factory :platform_kubernetes, class: Clusters::Platforms::Kubernetes do cluster - api_url 'https://kubernetes.example.com' - ca_cert nil - token 'a' * 40 - username 'xxxxxx' - password 'xxxxxx' namespace nil trait :ca_cert do @@ -14,5 +9,13 @@ FactoryGirl.define do platform_kubernetes.ca_cert = File.read(pem_file) end end + + trait :configured do + api_url 'https://kubernetes.example.com' + ca_cert nil + token 'a' * 40 + username 'xxxxxx' + password 'xxxxxx' + end end end diff --git a/spec/factories/clusters/platforms/gcp.rb b/spec/factories/clusters/providers/gcp.rb index c135bbb20a4..13bf50d7b7f 100644 --- a/spec/factories/clusters/platforms/gcp.rb +++ b/spec/factories/clusters/providers/gcp.rb @@ -3,6 +3,10 @@ FactoryGirl.define do cluster gcp_project_id 'test-gcp-project' + trait :scheduled do + access_token 'access_token_123' + end + trait :creating do access_token 'access_token_123' |