Merge branch 'revert-eac645d7' into 'master'

Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'"

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

2 files changed, 75 insertions, 87 deletions

diff --git a/spec/services/clusters/create_service_spec.rb b/spec/services/clusters/create_service_spec.rb
index 5373ad7f4b2..3959295c13e 100644
--- a/spec/services/clusters/create_service_spec.rb
+++ b/spec/services/clusters/create_service_spec.rb
@@ -2,104 +2,33 @@ require 'spec_helper'
 
 describe Clusters::CreateService do
   let(:access_token) { 'xxx' }
+  let(:project) { create(:project) }
   let(:user) { create(:user) }
-  let(:service) { described_class.new(user, params) }
 
-  describe '#execute' do
-    before do
-      allow(ClusterProvisionWorker).to receive(:perform_async)
-    end
+  subject { described_class.new(user, params).execute(project: project, access_token: access_token) }
 
-    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',
-            legacy_abac: 'true'
-          }
-        }
-      end
-    end
+  context 'when provider is gcp' do
+    context 'when project has no clusters' do
+      context 'when correct params' do
+        include_context 'valid cluster create params'
 
-    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'
-          }
-        }
+        include_examples 'create cluster service success'
       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)
+      context 'when invalid params' do
+        include_context 'invalid cluster create params'
 
-        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.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.provider).to be_legacy_abac
-        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
+        include_examples 'create cluster service error'
       end
     end
 
-    context 'create cluster for project' do
-      let(:project) { create(:project) }
+    context 'when project has a cluster' do
+      include_context 'valid cluster create params'
+      let!(:cluster) { create(:cluster, :provided_by_gcp, :production_environment, projects: [project]) }
 
-      subject { service.execute(project: project, access_token: access_token) }
-
-      context 'when project has no clusters' do
-        context 'when correct params' do
-          include_context 'valid cluster create params'
-
-          include_examples 'create cluster service success'
-
-          it 'associates project to the cluster' do
-            expect(subject.project).to eq(project)
-          end
-        end
-
-        context 'when invalid params' do
-          include_context 'invalid cluster create params'
-
-          include_examples 'create cluster service error'
-        end
-      end
-
-      context 'when project has a cluster' do
-        include_context 'valid cluster create params'
-        let!(:cluster) { create(:cluster, :provided_by_gcp, :production_environment, projects: [project]) }
-
-        it 'does not create a cluster' do
-          expect(ClusterProvisionWorker).not_to receive(:perform_async)
-          expect { subject }.to raise_error(ArgumentError).and change { Clusters::Cluster.count }.by(0)
-        end
+      it 'does not create a cluster' do
+        expect(ClusterProvisionWorker).not_to receive(:perform_async)
+        expect { subject }.to raise_error(ArgumentError).and change { Clusters::Cluster.count }.by(0)
       end
     end
   end
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..b0bf942aa09
--- /dev/null
+++ b/spec/support/services/clusters/create_service_shared.rb
@@ -0,0 +1,59 @@
+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',
+        legacy_abac: 'true'
+      }
+    }
+  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.provider).to be_legacy_abac
+    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