Merge branch 'refactor-project-cluster-controller-specs' into 'master'

Project::ClustersController spec improvement

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

spec/controllers/projects/clusters_controller_spec.rb

@@ -6,8 +6,6 @@ describe Projects::ClustersController do
 
   set(:project) { create(:project) }
 
-  describe 'GET index' do
-    describe 'functionality' do
   let(:user) { create(:user) }
 
   before do
@@ -15,6 +13,12 @@ describe Projects::ClustersController do
     sign_in(user)
   end
 
+  describe 'GET index' do
+    def go(params = {})
+      get :index, params.reverse_merge(namespace_id: project.namespace.to_param, project_id: project)
+    end
+
+    describe 'functionality' do
       context 'when project has one or more clusters' do
         let(:project) { create(:project) }
         let!(:enabled_cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
@@ -33,10 +37,11 @@ describe Projects::ClustersController do
           before do
             allow(Clusters::Cluster).to receive(:paginates_per).and_return(1)
             create_list(:cluster, 2, :provided_by_gcp, :production_environment, projects: [project])
-            get :index, namespace_id: project.namespace, project_id: project, page: last_page
           end
 
           it 'redirects to the page' do
+            go(page: last_page)
+
             expect(response).to have_gitlab_http_status(:ok)
             expect(assigns(:clusters).current_page).to eq(last_page)
           end
@@ -68,21 +73,14 @@ describe Projects::ClustersController do
       it { expect { go }.to be_denied_for(:user) }
       it { expect { go }.to be_denied_for(:external) }
     end
-
-    def go
-      get :index, namespace_id: project.namespace.to_param, project_id: project
-    end
   end
 
   describe 'GET new' do
-    describe 'functionality for new cluster' do
-      let(:user) { create(:user) }
-
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
+    def go
+      get :new, namespace_id: project.namespace, project_id: project
     end
 
+    describe 'functionality for new cluster' do
       context 'when omniauth has been configured' do
         let(:key) { 'secret-key' }
         let(:session_key_for_redirect_uri) do
@@ -139,13 +137,6 @@ describe Projects::ClustersController do
     end
 
     describe 'functionality for existing cluster' do
-      let(:user) { create(:user) }
-
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
-      end
-
       it 'has new object' do
         go
 
@@ -163,10 +154,6 @@ describe Projects::ClustersController do
       it { expect { go }.to be_denied_for(:user) }
       it { expect { go }.to be_denied_for(:external) }
     end
-
-    def go
-      get :new, namespace_id: project.namespace, project_id: project
-    end
   end
 
   describe 'POST create for new cluster' do
@@ -183,14 +170,11 @@ describe Projects::ClustersController do
       }
     end
 
-    describe 'functionality' do
-      let(:user) { create(:user) }
-
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
+    def go
+      post :create_gcp, params.merge(namespace_id: project.namespace, project_id: project)
     end
 
+    describe 'functionality' do
       context 'when access token is valid' do
         before do
           stub_google_api_validate_token
@@ -257,10 +241,6 @@ describe Projects::ClustersController do
       it { expect { go }.to be_denied_for(:user) }
       it { expect { go }.to be_denied_for(:external) }
     end
-
-    def go
-      post :create_gcp, params.merge(namespace_id: project.namespace, project_id: project)
-    end
   end
 
   describe 'POST create for existing cluster' do
@@ -277,14 +257,11 @@ describe Projects::ClustersController do
       }
     end
 
-    describe 'functionality' do
-      let(:user) { create(:user) }
-
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
+    def go
+      post :create_user, params.merge(namespace_id: project.namespace, project_id: project)
     end
 
+    describe 'functionality' do
       context 'when creates a cluster' do
         it 'creates a new cluster' do
           expect(ClusterProvisionWorker).to receive(:perform_async)
@@ -339,23 +316,19 @@ describe Projects::ClustersController do
       it { expect { go }.to be_denied_for(:user) }
       it { expect { go }.to be_denied_for(:external) }
     end
-
-    def go
-      post :create_user, params.merge(namespace_id: project.namespace, project_id: project)
-    end
   end
 
   describe 'GET status' do
     let(:cluster) { create(:cluster, :providing_by_gcp, projects: [project]) }
 
-    describe 'functionality' do
-      let(:user) { create(:user) }
-
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
+    def go
+      get :status, namespace_id: project.namespace,
+                   project_id: project,
+                   id: cluster,
+                   format: :json
     end
 
+    describe 'functionality' do
       it "responds with matching schema" do
         go
 
@@ -380,26 +353,18 @@ describe Projects::ClustersController do
       it { expect { go }.to be_denied_for(:user) }
       it { expect { go }.to be_denied_for(:external) }
     end
-
-    def go
-      get :status, namespace_id: project.namespace,
-                   project_id: project,
-                   id: cluster,
-                   format: :json
-    end
   end
 
   describe 'GET show' do
     let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
 
-    describe 'functionality' do
-      let(:user) { create(:user) }
-
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
+    def go
+      get :show, namespace_id: project.namespace,
+                 project_id: project,
+                 id: cluster
     end
 
+    describe 'functionality' do
       it "renders view" do
         go
 
@@ -418,25 +383,11 @@ describe Projects::ClustersController do
       it { expect { go }.to be_denied_for(:user) }
       it { expect { go }.to be_denied_for(:external) }
     end
-
-    def go
-      get :show, namespace_id: project.namespace,
-                 project_id: project,
-                 id: cluster
-    end
   end
 
   describe 'PUT update' do
-    context 'when cluster is provided by GCP' do
     let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
-      let(:user) { create(:user) }
 
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
-      end
-
-      context 'when changing parameters' do
     let(:params) do
       {
         cluster: {
@@ -449,6 +400,15 @@ describe Projects::ClustersController do
       }
     end
 
+    def go(format: :html)
+      put :update, params.merge(namespace_id: project.namespace,
+                                project_id: project,
+                                id: cluster,
+                                format: format
+                               )
+    end
+
+    context 'when cluster is provided by GCP' do
       it "updates and redirects back to show page" do
         go
 
@@ -461,6 +421,7 @@ describe Projects::ClustersController do
       it "does not change cluster name" do
         go
 
+        cluster.reload
         expect(cluster.name).to eq('test-cluster')
       end
 
@@ -476,20 +437,10 @@ describe Projects::ClustersController do
         end
       end
     end
-    end
 
     context 'when cluster is provided by user' do
       let(:cluster) { create(:cluster, :provided_by_user, projects: [project]) }
-      let(:user) { create(:user) }
-
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
-      end
 
-      context 'when format is json' do
-        context 'when changing parameters' do
-          context 'when valid parameters are used' do
       let(:params) do
         {
           cluster: {
@@ -503,60 +454,59 @@ describe Projects::ClustersController do
       end
 
       it "updates and redirects back to show page" do
-              go_json
+        go
 
         cluster.reload
-              expect(response).to have_http_status(:no_content)
+        expect(response).to redirect_to(project_cluster_path(project, cluster))
+        expect(flash[:notice]).to eq('Kubernetes cluster was successfully updated.')
         expect(cluster.enabled).to be_falsey
         expect(cluster.name).to eq('my-new-cluster-name')
         expect(cluster.platform_kubernetes.namespace).to eq('my-namespace')
       end
-          end
 
-          context 'when invalid parameters are used' do
+      context 'when format is json' do
+        context 'when changing parameters' do
+          context 'when valid parameters are used' do
             let(:params) do
               {
                 cluster: {
                   enabled: false,
+                  name: 'my-new-cluster-name',
                   platform_kubernetes_attributes: {
-                    namespace: 'my invalid namespace #@'
+                    namespace: 'my-namespace'
                   }
                 }
               }
             end
 
-            it "rejects changes" do
-              go_json
+            it "updates and redirects back to show page" do
+              go(format: :json)
 
-              expect(response).to have_http_status(:bad_request)
-            end
-          end
+              cluster.reload
+              expect(response).to have_http_status(:no_content)
+              expect(cluster.enabled).to be_falsey
+              expect(cluster.name).to eq('my-new-cluster-name')
+              expect(cluster.platform_kubernetes.namespace).to eq('my-namespace')
             end
           end
 
-      context 'when format is html' do
-        context 'when update enabled' do
+          context 'when invalid parameters are used' do
             let(:params) do
               {
                 cluster: {
                   enabled: false,
-                name: 'my-new-cluster-name',
                   platform_kubernetes_attributes: {
-                  namespace: 'my-namespace'
+                    namespace: 'my invalid namespace #@'
                   }
                 }
               }
             end
 
-          it "updates and redirects back to show page" do
-            go
+            it "rejects changes" do
+              go(format: :json)
 
-            cluster.reload
-            expect(response).to redirect_to(project_cluster_path(project, cluster))
-            expect(flash[:notice]).to eq('Kubernetes cluster was successfully updated.')
-            expect(cluster.enabled).to be_falsey
-            expect(cluster.name).to eq('my-new-cluster-name')
-            expect(cluster.platform_kubernetes.namespace).to eq('my-namespace')
+              expect(response).to have_http_status(:bad_request)
+            end
           end
         end
       end
@@ -565,10 +515,6 @@ describe Projects::ClustersController do
     describe 'security' do
       set(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) }
 
-      let(:params) do
-        { cluster: { enabled: false } }
-      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(:maintainer).of(project) }
@@ -578,34 +524,20 @@ describe Projects::ClustersController do
       it { expect { go }.to be_denied_for(:user) }
       it { expect { go }.to be_denied_for(:external) }
     end
-
-    def go
-      put :update, params.merge(namespace_id: project.namespace,
-                                project_id: project,
-                                id: cluster)
-    end
-
-    def go_json
-      put :update, params.merge(namespace_id: project.namespace,
-                                project_id: project,
-                                id: cluster,
-                                format: :json)
-    end
   end
 
   describe 'DELETE destroy' do
-    describe 'functionality' do
-      let(:user) { create(:user) }
+    let!(:cluster) { create(:cluster, :provided_by_gcp, :production_environment, projects: [project]) }
 
-      before do
-        project.add_maintainer(user)
-        sign_in(user)
+    def go
+      delete :destroy, namespace_id: project.namespace,
+                       project_id: project,
+                       id: cluster
     end
 
+    describe 'functionality' do
       context 'when cluster is provided by GCP' do
         context 'when cluster is created' do
-          let!(:cluster) { create(:cluster, :provided_by_gcp, :production_environment, projects: [project]) }
-
           it "destroys and redirects back to clusters list" do
             expect { go }
               .to change { Clusters::Cluster.count }.by(-1)
@@ -658,11 +590,5 @@ describe Projects::ClustersController do
       it { expect { go }.to be_denied_for(:user) }
       it { expect { go }.to be_denied_for(:external) }
     end
-
-    def go
-      delete :destroy, namespace_id: project.namespace,
-                       project_id: project,
-                       id: cluster
-    end
   end
 end