Merge branch 'ce-5968-extract-ee-specific-files-lines-for-clusters-related-files' into 'master'

Backport Cluster related EE code

See merge request gitlab-org/gitlab-ce!18931

4 files changed, 65 insertions, 65 deletions

diff --git a/spec/factories/clusters/clusters.rb b/spec/factories/clusters/clusters.rb
index 98566f907f9..0430762c1ff 100644
--- a/spec/factories/clusters/clusters.rb
+++ b/spec/factories/clusters/clusters.rb
@@ -4,8 +4,8 @@ FactoryBot.define do
     name 'test-cluster'
 
     trait :project do
-      after(:create) do |cluster, evaluator|
-        cluster.projects << create(:project)
+      before(:create) do |cluster, evaluator|
+        cluster.projects << create(:project, :repository)
       end
     end
 
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index fe334b531f0..a8a627d8806 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -182,6 +182,7 @@ feature 'Gcp Cluster', :js do
 
     it 'user sees a login page' do
       expect(page).to have_css('.signin-with-google')
+      expect(page).to have_link('Google account')
     end
   end
 
diff --git a/spec/services/clusters/create_service_spec.rb b/spec/services/clusters/create_service_spec.rb
index 1c2f9c5cf43..1685dc748bd 100644
--- a/spec/services/clusters/create_service_spec.rb
+++ b/spec/services/clusters/create_service_spec.rb
@@ -8,80 +8,22 @@ describe Clusters::CreateService do
   subject { described_class.new(project, user, params).execute(access_token) }
 
   context 'when provider is gcp' do
-    shared_context 'valid params' do
-      let(:params) do
-        {
-          name: 'test-cluster',
-          provider_type: :gcp,
-          provider_gcp_attributes: {
-            gcp_project_id: 'gcp-project',
-            zone: 'us-central1-a',
-            num_nodes: 1,
-            machine_type: 'machine_type-a'
-          }
-        }
-      end
-    end
-
-    shared_context 'invalid params' do
-      let(:params) do
-        {
-          name: 'test-cluster',
-          provider_type: :gcp,
-          provider_gcp_attributes: {
-            gcp_project_id: '!!!!!!!',
-            zone: 'us-central1-a',
-            num_nodes: 1,
-            machine_type: 'machine_type-a'
-          }
-        }
-      end
-    end
-
-    shared_examples 'create cluster' do
-      it 'creates a cluster object and performs a worker' do
-        expect(ClusterProvisionWorker).to receive(:perform_async)
-
-        expect { subject }
-          .to change { Clusters::Cluster.count }.by(1)
-          .and change { Clusters::Providers::Gcp.count }.by(1)
-
-        expect(subject.name).to eq('test-cluster')
-        expect(subject.user).to eq(user)
-        expect(subject.project).to eq(project)
-        expect(subject.provider.gcp_project_id).to eq('gcp-project')
-        expect(subject.provider.zone).to eq('us-central1-a')
-        expect(subject.provider.num_nodes).to eq(1)
-        expect(subject.provider.machine_type).to eq('machine_type-a')
-        expect(subject.provider.access_token).to eq(access_token)
-        expect(subject.platform).to be_nil
-      end
-    end
-
-    shared_examples 'error' do
-      it 'returns an error' do
-        expect(ClusterProvisionWorker).not_to receive(:perform_async)
-        expect { subject }.to change { Clusters::Cluster.count }.by(0)
-        expect(subject.errors[:"provider_gcp.gcp_project_id"]).to be_present
-      end
-    end
-
     context 'when project has no clusters' do
       context 'when correct params' do
-        include_context 'valid params'
+        include_context 'valid cluster create params'
 
-        include_examples 'create cluster'
+        include_examples 'create cluster service success'
       end
 
       context 'when invalid params' do
-        include_context 'invalid params'
+        include_context 'invalid cluster create params'
 
-        include_examples 'error'
+        include_examples 'create cluster service error'
       end
     end
 
     context 'when project has a cluster' do
-      include_context 'valid params'
+      include_context 'valid cluster create params'
       let!(:cluster) { create(:cluster, :provided_by_gcp, :production_environment, projects: [project]) }
 
       it 'does not create a cluster' do
diff --git a/spec/support/services/clusters/create_service_shared.rb b/spec/support/services/clusters/create_service_shared.rb
new file mode 100644
index 00000000000..43a2fd05498
--- /dev/null
+++ b/spec/support/services/clusters/create_service_shared.rb
@@ -0,0 +1,57 @@
+shared_context 'valid cluster create params' do
+  let(:params) do
+    {
+      name: 'test-cluster',
+      provider_type: :gcp,
+      provider_gcp_attributes: {
+        gcp_project_id: 'gcp-project',
+        zone: 'us-central1-a',
+        num_nodes: 1,
+        machine_type: 'machine_type-a'
+      }
+    }
+  end
+end
+
+shared_context 'invalid cluster create params' do
+  let(:params) do
+    {
+      name: 'test-cluster',
+      provider_type: :gcp,
+      provider_gcp_attributes: {
+        gcp_project_id: '!!!!!!!',
+        zone: 'us-central1-a',
+        num_nodes: 1,
+        machine_type: 'machine_type-a'
+      }
+    }
+  end
+end
+
+shared_examples 'create cluster service success' do
+  it 'creates a cluster object and performs a worker' do
+    expect(ClusterProvisionWorker).to receive(:perform_async)
+
+    expect { subject }
+      .to change { Clusters::Cluster.count }.by(1)
+      .and change { Clusters::Providers::Gcp.count }.by(1)
+
+    expect(subject.name).to eq('test-cluster')
+    expect(subject.user).to eq(user)
+    expect(subject.project).to eq(project)
+    expect(subject.provider.gcp_project_id).to eq('gcp-project')
+    expect(subject.provider.zone).to eq('us-central1-a')
+    expect(subject.provider.num_nodes).to eq(1)
+    expect(subject.provider.machine_type).to eq('machine_type-a')
+    expect(subject.provider.access_token).to eq(access_token)
+    expect(subject.platform).to be_nil
+  end
+end
+
+shared_examples 'create cluster service error' do
+  it 'returns an error' do
+    expect(ClusterProvisionWorker).not_to receive(:perform_async)
+    expect { subject }.to change { Clusters::Cluster.count }.by(0)
+    expect(subject.errors[:"provider_gcp.gcp_project_id"]).to be_present
+  end
+end