update tests

3 files changed, 164 insertions, 142 deletions

diff --git a/spec/controllers/projects/clusters/gcp_controller_spec.rb b/spec/controllers/projects/clusters/gcp_controller_spec.rb
new file mode 100644
index 00000000000..acaf2a1b948
--- /dev/null
+++ b/spec/controllers/projects/clusters/gcp_controller_spec.rb
@@ -0,0 +1,95 @@
+require 'spec_helper'
+
+describe Projects::Clusters::GcpController do
+  include AccessMatchersForController
+  include GoogleApi::CloudPlatformHelpers
+
+  set(:project) { create(:project) }
+
+  describe 'POST create' do
+    let(:params) do
+      {
+        cluster: {
+          name: 'new-cluster',
+          provider_gcp_attributes: {
+            gcp_project_id: '111'
+          }
+        }
+      }
+    end
+
+    before do
+      allow_any_instance_of(GoogleApi::CloudPlatform::Client)
+        .to receive(:projects_zones_clusters_create) do
+        OpenStruct.new(
+          self_link: 'projects/gcp-project-12345/zones/us-central1-a/operations/ope-123',
+          status: 'RUNNING'
+        )
+      end
+    end
+
+    describe 'functionality' do
+      let(:user) { create(:user) }
+
+      before do
+        project.add_master(user)
+        sign_in(user)
+      end
+
+      context 'when access token is valid' do
+        before do
+          stub_google_api_validate_token
+        end
+
+        it 'creates a new cluster' do
+          expect(ClusterProvisionWorker).to receive(:perform_async)
+          expect { go }.to change { Clusters::Cluster.count }
+            .and change { Clusters::Providers::Gcp.count }
+          expect(response).to redirect_to(project_cluster_path(project, project.clusters.first))
+          expect(project.clusters.first).to be_gcp
+          expect(project.clusters.first).to be_kubernetes
+        end
+      end
+
+      context 'when access token is expired' do
+        before do
+          stub_google_api_expired_token
+        end
+
+        it 'redirects to new clusters form' do
+          puts described_class
+          expect(go).to redirect_to(new_project_cluster_path(project))
+        end
+      end
+
+      context 'when access token is not stored in session' do
+        it 'redirects to new clusters form' do
+          expect(go).to redirect_to(new_project_cluster_path(project))
+        end
+      end
+    end
+
+    describe 'security' do
+      before do
+        allow_any_instance_of(described_class)
+        .to receive(:token_in_session).and_return('token')
+        allow_any_instance_of(described_class)
+        .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s)
+        allow(WaitForClusterCreationWorker).to receive(:perform_in).and_return(nil)
+      end
+
+      it { expect { go }.to be_allowed_for(:admin) }
+      it { expect { go }.to be_allowed_for(:owner).of(project) }
+      it { expect { go }.to be_allowed_for(:master).of(project) }
+      it { expect { go }.to be_denied_for(:developer).of(project) }
+      it { expect { go }.to be_denied_for(:reporter).of(project) }
+      it { expect { go }.to be_denied_for(:guest).of(project) }
+      it { expect { go }.to be_denied_for(:user) }
+      it { expect { go }.to be_denied_for(:external) }
+    end
+
+    def go
+      post :create, params.merge(namespace_id: project.namespace, project_id: project)
+    end
+  end
+end
diff --git a/spec/controllers/projects/clusters/user_controller_spec.rb b/spec/controllers/projects/clusters/user_controller_spec.rb
new file mode 100644
index 00000000000..eba1c62a1f2
--- /dev/null
+++ b/spec/controllers/projects/clusters/user_controller_spec.rb
@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe Projects::Clusters::UserController do
+  include AccessMatchersForController
+
+  set(:project) { create(:project) }
+
+  describe 'POST create' do
+    let(:params) do
+      {
+        cluster: {
+          name: 'new-cluster',
+          platform_kubernetes_attributes: {
+            api_url: 'http://my-url',
+            token: 'test',
+            namespace: 'aaa'
+          }
+        }
+      }
+    end
+
+    describe 'functionality' do
+      let(:user) { create(:user) }
+
+      before do
+        project.add_master(user)
+        sign_in(user)
+      end
+
+      context 'when creates a cluster' do
+        it 'creates a new cluster' do
+          expect(ClusterProvisionWorker).to receive(:perform_async)
+          expect { go }.to change { Clusters::Cluster.count }
+            .and change { Clusters::Platforms::Kubernetes.count }
+          expect(response).to redirect_to(project_cluster_path(project, project.clusters.first))
+          expect(project.clusters.first).to be_user
+          expect(project.clusters.first).to be_kubernetes
+        end
+      end
+    end
+
+    describe 'security' do
+      it { expect { go }.to be_allowed_for(:admin) }
+      it { expect { go }.to be_allowed_for(:owner).of(project) }
+      it { expect { go }.to be_allowed_for(:master).of(project) }
+      it { expect { go }.to be_denied_for(:developer).of(project) }
+      it { expect { go }.to be_denied_for(:reporter).of(project) }
+      it { expect { go }.to be_denied_for(:guest).of(project) }
+      it { expect { go }.to be_denied_for(:user) }
+      it { expect { go }.to be_denied_for(:external) }
+    end
+
+    def go
+      post :create, params.merge(namespace_id: project.namespace, project_id: project)
+    end
+  end
+end
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index c4f43fd6bb4..a3aab70ab77 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Projects::ClustersController do
   include AccessMatchersForController
   include GoogleApi::CloudPlatformHelpers
+  include ClustersHelper
 
   set(:project) { create(:project) }
 
@@ -75,12 +76,13 @@ describe Projects::ClustersController do
   end
 
   describe 'GET new' do
-    describe 'functionality for new cluster' do
+    describe 'functionality for gcp cluster' do
       let(:user) { create(:user) }
 
       before do
         project.add_master(user)
         sign_in(user)
+        @project = project
       end
 
       context 'when omniauth has been configured' do
@@ -93,10 +95,10 @@ describe Projects::ClustersController do
           allow(SecureRandom).to receive(:hex).and_return(key)
         end
 
-        it 'has authorize_url' do
+        it 'has gcp_authorize_url' do
           go
 
-          expect(assigns(:authorize_url)).to include(key)
+          expect(gcp_authorize_url).to include(key)
           expect(session[session_key_for_redirect_uri]).to eq(new_project_cluster_path(project))
         end
       end
@@ -106,10 +108,10 @@ describe Projects::ClustersController do
           stub_omniauth_setting(providers: [])
         end
 
-        it 'does not have authorize_url' do
+        it 'does not have gcp_authorize_url' do
           go
 
-          expect(assigns(:authorize_url)).to be_nil
+          expect(gcp_authorize_url).to be_nil
         end
       end
 
@@ -121,7 +123,7 @@ describe Projects::ClustersController do
         it 'has new object' do
           go
 
-          expect(assigns(:new_cluster)).to be_an_instance_of(Clusters::Cluster)
+          expect(assigns(:gcp_cluster)).to be_an_instance_of(Clusters::Cluster)
         end
       end
 
@@ -130,15 +132,15 @@ describe Projects::ClustersController do
           stub_google_api_expired_token
         end
 
-        it { expect(@valid_gcp_token).to be_falsey }
+        it { expect(valid_gcp_token).to be_falsey }
       end
 
       context 'when access token is not stored in session' do
-        it { expect(@valid_gcp_token).to be_falsey }
+        it { expect(valid_gcp_token).to be_falsey }
       end
     end
 
-    describe 'functionality for existing cluster' do
+    describe 'functionality for user cluster' do
       let(:user) { create(:user) }
 
       before do
@@ -149,7 +151,7 @@ describe Projects::ClustersController do
       it 'has new object' do
         go
 
-        expect(assigns(:existing_cluster)).to be_an_instance_of(Clusters::Cluster)
+        expect(assigns(:user_cluster)).to be_an_instance_of(Clusters::Cluster)
       end
     end
 
@@ -169,138 +171,6 @@ describe Projects::ClustersController do
     end
   end
 
-  describe 'POST create for new cluster' do
-    let(:params) do
-      {
-        type: 'new',
-        cluster: {
-          name: 'new-cluster',
-          provider_gcp_attributes: {
-            gcp_project_id: 'gcp-project-12345'
-          }
-        }
-      }
-    end
-
-    describe 'functionality' do
-      let(:user) { create(:user) }
-
-      before do
-        project.add_master(user)
-        sign_in(user)
-      end
-
-      context 'when access token is valid' do
-        before do
-          stub_google_api_validate_token
-        end
-
-        it 'creates a new cluster' do
-          expect(ClusterProvisionWorker).to receive(:perform_async)
-          expect { go }.to change { Clusters::Cluster.count }
-            .and change { Clusters::Providers::Gcp.count }
-          expect(response).to redirect_to(project_cluster_path(project, project.clusters.first))
-          expect(project.clusters.first).to be_gcp
-          expect(project.clusters.first).to be_kubernetes
-        end
-      end
-
-      context 'when access token is expired' do
-        before do
-          stub_google_api_expired_token
-        end
-
-        it { expect(@valid_gcp_token).to be_falsey }
-      end
-
-      context 'when access token is not stored in session' do
-        it { expect(@valid_gcp_token).to be_falsey }
-      end
-    end
-
-    describe 'security' do
-      before do
-        allow_any_instance_of(described_class)
-        .to receive(:token_in_session).and_return('token')
-        allow_any_instance_of(described_class)
-        .to receive(:expires_at_in_session).and_return(1.hour.since.to_i.to_s)
-        allow_any_instance_of(GoogleApi::CloudPlatform::Client)
-          .to receive(:projects_zones_clusters_create) do
-          OpenStruct.new(
-            self_link: 'projects/gcp-project-12345/zones/us-central1-a/operations/ope-123',
-            status: 'RUNNING'
-          )
-        end
-
-        allow(WaitForClusterCreationWorker).to receive(:perform_in).and_return(nil)
-      end
-
-      it { expect { go }.to be_allowed_for(:admin) }
-      it { expect { go }.to be_allowed_for(:owner).of(project) }
-      it { expect { go }.to be_allowed_for(:master).of(project) }
-      it { expect { go }.to be_denied_for(:developer).of(project) }
-      it { expect { go }.to be_denied_for(:reporter).of(project) }
-      it { expect { go }.to be_denied_for(:guest).of(project) }
-      it { expect { go }.to be_denied_for(:user) }
-      it { expect { go }.to be_denied_for(:external) }
-    end
-
-    def go
-      post :create, params.merge(namespace_id: project.namespace, project_id: project)
-    end
-  end
-
-  describe 'POST create for existing cluster' do
-    let(:params) do
-      {
-        type: 'existing',
-        cluster: {
-          name: 'new-cluster',
-          platform_kubernetes_attributes: {
-            api_url: 'http://my-url',
-            token: 'test',
-            namespace: 'aaa'
-          }
-        }
-      }
-    end
-
-    describe 'functionality' do
-      let(:user) { create(:user) }
-
-      before do
-        project.add_master(user)
-        sign_in(user)
-      end
-
-      context 'when creates a cluster' do
-        it 'creates a new cluster' do
-          expect(ClusterProvisionWorker).to receive(:perform_async)
-          expect { go }.to change { Clusters::Cluster.count }
-            .and change { Clusters::Platforms::Kubernetes.count }
-          expect(response).to redirect_to(project_cluster_path(project, project.clusters.first))
-          expect(project.clusters.first).to be_user
-          expect(project.clusters.first).to be_kubernetes
-        end
-      end
-    end
-
-    describe 'security' do
-      it { expect { go }.to be_allowed_for(:admin) }
-      it { expect { go }.to be_allowed_for(:owner).of(project) }
-      it { expect { go }.to be_allowed_for(:master).of(project) }
-      it { expect { go }.to be_denied_for(:developer).of(project) }
-      it { expect { go }.to be_denied_for(:reporter).of(project) }
-      it { expect { go }.to be_denied_for(:guest).of(project) }
-      it { expect { go }.to be_denied_for(:user) }
-      it { expect { go }.to be_denied_for(:external) }
-    end
-
-    def go
-      post :create, params.merge(namespace_id: project.namespace, project_id: project)
-    end
-  end
-
   describe 'GET status' do
     let(:cluster) { create(:cluster, :providing_by_gcp, projects: [project]) }