Merge branch 'master' into 38464-k8s-apps

2 files changed, 22 insertions, 22 deletions

diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index e6ebe079ceb..ed76be703a5 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -9,7 +9,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
 
   describe 'before_validation' do
     context 'when namespace includes upper case' do
-      let(:kubernetes) { create(:platform_kubernetes, :configured, namespace: namespace) }
+      let(:kubernetes) { create(:cluster_platform_kubernetes, :configured, namespace: namespace) }
       let(:namespace) { 'ABC' }
 
       it 'converts to lower case' do
@@ -22,7 +22,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
     subject { kubernetes.valid? }
 
     context 'when validates namespace' do
-      let(:kubernetes) { build(:platform_kubernetes, :configured, namespace: namespace) }
+      let(:kubernetes) { build(:cluster_platform_kubernetes, :configured, namespace: namespace) }
 
       context 'when namespace is blank' do
         let(:namespace) { '' }
@@ -50,7 +50,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
     end
 
     context 'when validates api_url' do
-      let(:kubernetes) { build(:platform_kubernetes, :configured) }
+      let(:kubernetes) { build(:cluster_platform_kubernetes, :configured) }
 
       before do
         kubernetes.api_url = api_url
@@ -76,7 +76,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
     end
 
     context 'when validates token' do
-      let(:kubernetes) { build(:platform_kubernetes, :configured) }
+      let(:kubernetes) { build(:cluster_platform_kubernetes, :configured) }
 
       before do
         kubernetes.token = token
@@ -95,8 +95,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
       let(:enabled) { true }
       let(:project) { create(:project) }
       let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, enabled: enabled, projects: [project]) }
-      let(:platform) { build(:platform_kubernetes, :configured) }
-      let(:provider) { build(:provider_gcp) }
+      let(:platform) { build(:cluster_platform_kubernetes, :configured) }
+      let(:provider) { build(:cluster_provider_gcp) }
       let(:kubernetes_service) { project.kubernetes_service }
 
       it 'updates KubernetesService' do
@@ -126,8 +126,8 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
     context 'when kubernetes_service has been configured without cluster integration' do
       let!(:project) { create(:project) }
       let(:cluster) { build(:cluster, provider_type: :gcp, platform_type: :kubernetes, platform_kubernetes: platform, provider_gcp: provider, projects: [project]) }
-      let(:platform) { build(:platform_kubernetes, :configured, api_url: 'https://111.111.111.111') }
-      let(:provider) { build(:provider_gcp) }
+      let(:platform) { build(:cluster_platform_kubernetes, :configured, api_url: 'https://111.111.111.111') }
+      let(:provider) { build(:cluster_provider_gcp) }
 
       before do
         create(:kubernetes_service, project: project)
@@ -144,7 +144,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
 
     let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) }
     let(:project) { cluster.project }
-    let(:kubernetes) { create(:platform_kubernetes, :configured, namespace: namespace) }
+    let(:kubernetes) { create(:cluster_platform_kubernetes, :configured, namespace: namespace) }
 
     context 'when namespace is present' do
       let(:namespace) { 'namespace-123' }
@@ -170,7 +170,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
   describe '#default_namespace' do
     subject { kubernetes.default_namespace }
 
-    let(:kubernetes) { create(:platform_kubernetes, :configured) }
+    let(:kubernetes) { create(:cluster_platform_kubernetes, :configured) }
 
     context 'when cluster belongs to a project' do
       let!(:cluster) { create(:cluster, :project, platform_kubernetes: kubernetes) }
diff --git a/spec/models/clusters/providers/gcp_spec.rb b/spec/models/clusters/providers/gcp_spec.rb
index 99eb8c46e9a..ecd0a08c953 100644
--- a/spec/models/clusters/providers/gcp_spec.rb
+++ b/spec/models/clusters/providers/gcp_spec.rb
@@ -5,7 +5,7 @@ describe Clusters::Providers::Gcp do
   it { is_expected.to validate_presence_of(:zone) }
 
   describe 'default_value_for' do
-    let(:gcp) { build(:provider_gcp) }
+    let(:gcp) { build(:cluster_provider_gcp) }
 
     it "has default value" do
       expect(gcp.zone).to eq('us-central1-a')
@@ -18,7 +18,7 @@ describe Clusters::Providers::Gcp do
     subject { gcp.valid? }
 
     context 'when validates gcp_project_id' do
-      let(:gcp) { build(:provider_gcp, gcp_project_id: gcp_project_id) }
+      let(:gcp) { build(:cluster_provider_gcp, gcp_project_id: gcp_project_id) }
 
       context 'when gcp_project_id is shorter than 1' do
         let(:gcp_project_id) { '' }
@@ -46,7 +46,7 @@ describe Clusters::Providers::Gcp do
     end
 
     context 'when validates num_nodes' do
-      let(:gcp) { build(:provider_gcp, num_nodes: num_nodes) }
+      let(:gcp) { build(:cluster_provider_gcp, num_nodes: num_nodes) }
 
       context 'when num_nodes is string' do
         let(:num_nodes) { 'A3' }
@@ -76,7 +76,7 @@ describe Clusters::Providers::Gcp do
 
   describe '#state_machine' do
     context 'when any => [:created]' do
-      let(:gcp) { build(:provider_gcp, :creating) }
+      let(:gcp) { build(:cluster_provider_gcp, :creating) }
 
       before do
         gcp.make_created
@@ -90,7 +90,7 @@ describe Clusters::Providers::Gcp do
     end
 
     context 'when any => [:creating]' do
-      let(:gcp) { build(:provider_gcp) }
+      let(:gcp) { build(:cluster_provider_gcp) }
 
       context 'when operation_id is present' do
         let(:operation_id) { 'operation-xxx' }
@@ -116,7 +116,7 @@ describe Clusters::Providers::Gcp do
     end
 
     context 'when any => [:errored]' do
-      let(:gcp) { build(:provider_gcp, :creating) }
+      let(:gcp) { build(:cluster_provider_gcp, :creating) }
       let(:status_reason) { 'err msg' }
 
       it 'nullify access_token and operation_id' do
@@ -129,7 +129,7 @@ describe Clusters::Providers::Gcp do
       end
 
       context 'when status_reason is nil' do
-        let(:gcp) { build(:provider_gcp, :errored) }
+        let(:gcp) { build(:cluster_provider_gcp, :errored) }
 
         it 'does not set status_reason' do
           gcp.make_errored(nil)
@@ -144,13 +144,13 @@ describe Clusters::Providers::Gcp do
     subject { gcp.on_creation? }
 
     context 'when status is creating' do
-      let(:gcp) { create(:provider_gcp, :creating) }
+      let(:gcp) { create(:cluster_provider_gcp, :creating) }
 
       it { is_expected.to be_truthy }
     end
 
     context 'when status is created' do
-      let(:gcp) { create(:provider_gcp, :created) }
+      let(:gcp) { create(:cluster_provider_gcp, :created) }
 
       it { is_expected.to be_falsey }
     end
@@ -160,7 +160,7 @@ describe Clusters::Providers::Gcp do
     subject { gcp.api_client }
 
     context 'when status is creating' do
-      let(:gcp) { build(:provider_gcp, :creating) }
+      let(:gcp) { build(:cluster_provider_gcp, :creating) }
 
       it 'returns Cloud Platform API clinet' do
         expect(subject).to be_an_instance_of(GoogleApi::CloudPlatform::Client)
@@ -169,13 +169,13 @@ describe Clusters::Providers::Gcp do
     end
 
     context 'when status is created' do
-      let(:gcp) { build(:provider_gcp, :created) }
+      let(:gcp) { build(:cluster_provider_gcp, :created) }
 
       it { is_expected.to be_nil }
     end
 
     context 'when status is errored' do
-      let(:gcp) { build(:provider_gcp, :errored) }
+      let(:gcp) { build(:cluster_provider_gcp, :errored) }
 
       it { is_expected.to be_nil }
     end