Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-06 17:06:10 +0300
committerShinya Maeda <shinya@gitlab.com>2017-11-06 17:06:10 +0300
commita99ad59e655d66fda8af7f2b89aced79b8bc1060 (patch)
treec324ee36e56192feba969709807f7e7c329e3fbf /spec/factories/clusters
parent377916ed72cf31ee31e463f395993d1ec0dc579b (diff)
Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory name. Use ArgumentError
Diffstat (limited to 'spec/factories/clusters')
-rw-r--r--spec/factories/clusters/cluster.rb8
-rw-r--r--spec/factories/clusters/platforms/kubernetes.rb2
-rw-r--r--spec/factories/clusters/providers/gcp.rb2
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/factories/clusters/cluster.rb b/spec/factories/clusters/cluster.rb
index 802981d47a0..c4261178f2d 100644
--- a/spec/factories/clusters/cluster.rb
+++ b/spec/factories/clusters/cluster.rb
@@ -14,7 +14,7 @@ FactoryGirl.define do
platform_type :kubernetes
platform_kubernetes do
- create(:platform_kubernetes, :configured)
+ create(:cluster_platform_kubernetes, :configured)
end
end
@@ -23,8 +23,8 @@ FactoryGirl.define do
platform_type :kubernetes
before(:create) do |cluster, evaluator|
- cluster.platform_kubernetes = build(:platform_kubernetes, :configured)
- cluster.provider_gcp = build(:provider_gcp, :created)
+ cluster.platform_kubernetes = build(:cluster_platform_kubernetes, :configured)
+ cluster.provider_gcp = build(:cluster_provider_gcp, :created)
end
end
@@ -32,7 +32,7 @@ FactoryGirl.define do
provider_type :gcp
provider_gcp do
- create(:provider_gcp, :creating)
+ create(:cluster_provider_gcp, :creating)
end
end
end
diff --git a/spec/factories/clusters/platforms/kubernetes.rb b/spec/factories/clusters/platforms/kubernetes.rb
index 5d4e3e5cf5d..8b3e6ff35fa 100644
--- a/spec/factories/clusters/platforms/kubernetes.rb
+++ b/spec/factories/clusters/platforms/kubernetes.rb
@@ -1,5 +1,5 @@
FactoryGirl.define do
- factory :platform_kubernetes, class: Clusters::Platforms::Kubernetes do
+ factory :cluster_platform_kubernetes, class: Clusters::Platforms::Kubernetes do
cluster
namespace nil
api_url 'https://kubernetes.example.com'
diff --git a/spec/factories/clusters/providers/gcp.rb b/spec/factories/clusters/providers/gcp.rb
index 13bf50d7b7f..a815410512a 100644
--- a/spec/factories/clusters/providers/gcp.rb
+++ b/spec/factories/clusters/providers/gcp.rb
@@ -1,5 +1,5 @@
FactoryGirl.define do
- factory :provider_gcp, class: Clusters::Providers::Gcp do
+ factory :cluster_provider_gcp, class: Clusters::Providers::Gcp do
cluster
gcp_project_id 'test-gcp-project'