From 5a042ef2fbe1bd57b9428c89b49d2fa1e248ad46 Mon Sep 17 00:00:00 2001
From: Thong Kuah <tkuah@gitlab.com>
Date: Tue, 6 Nov 2018 21:55:10 +1300
Subject: Only project clusters has Project Namespace field

Group clusters should not allow Project Namespace so don't show that
field input too
---
 spec/controllers/groups/clusters_controller_spec.rb   | 18 +++---------------
 spec/controllers/projects/clusters_controller_spec.rb |  4 ++--
 spec/factories/clusters/platforms/kubernetes.rb       |  2 +-
 spec/models/clusters/platforms/kubernetes_spec.rb     | 12 ++++++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'spec')

diff --git a/spec/controllers/groups/clusters_controller_spec.rb b/spec/controllers/groups/clusters_controller_spec.rb
index 92a7ee6d84b..6be1d300aa4 100644
--- a/spec/controllers/groups/clusters_controller_spec.rb
+++ b/spec/controllers/groups/clusters_controller_spec.rb
@@ -146,7 +146,7 @@ describe Groups::ClustersController do
         it 'has new object' do
           go
 
-          expect(assigns(:gcp_cluster)).to be_an_instance_of(Clusters::Cluster)
+          expect(assigns(:gcp_cluster)).to be_an_instance_of(Clusters::ClusterPresenter)
         end
       end
 
@@ -167,7 +167,7 @@ describe Groups::ClustersController do
       it 'has new object' do
         go
 
-        expect(assigns(:user_cluster)).to be_an_instance_of(Clusters::Cluster)
+        expect(assigns(:user_cluster)).to be_an_instance_of(Clusters::ClusterPresenter)
       end
     end
 
@@ -281,7 +281,6 @@ describe Groups::ClustersController do
           platform_kubernetes_attributes: {
             api_url: 'http://my-url',
             token: 'test',
-            namespace: 'aaa'
           }
         }
       }
@@ -315,7 +314,6 @@ describe Groups::ClustersController do
               platform_kubernetes_attributes: {
                 api_url: 'http://my-url',
                 token: 'test',
-                namespace: 'aaa',
                 authorization_type: 'rbac'
               }
             }
@@ -433,9 +431,6 @@ describe Groups::ClustersController do
         cluster: {
           enabled: false,
           name: 'my-new-cluster-name',
-          platform_kubernetes_attributes: {
-            namespace: 'my-namespace'
-          }
         }
       }
     end
@@ -448,7 +443,6 @@ describe Groups::ClustersController do
       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
 
     context 'when format is json' do
@@ -459,9 +453,6 @@ describe Groups::ClustersController do
               cluster: {
                 enabled: false,
                 name: 'my-new-cluster-name',
-                platform_kubernetes_attributes: {
-                  namespace: 'my-namespace'
-                }
               }
             }
           end
@@ -473,7 +464,6 @@ describe Groups::ClustersController do
             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
 
@@ -482,9 +472,7 @@ describe Groups::ClustersController do
             {
               cluster: {
                 enabled: false,
-                platform_kubernetes_attributes: {
-                  namespace: 'my invalid namespace #@'
-                }
+                name: ''
               }
             }
           end
diff --git a/spec/controllers/projects/clusters_controller_spec.rb b/spec/controllers/projects/clusters_controller_spec.rb
index e7bb4035e55..483222363bb 100644
--- a/spec/controllers/projects/clusters_controller_spec.rb
+++ b/spec/controllers/projects/clusters_controller_spec.rb
@@ -122,7 +122,7 @@ describe Projects::ClustersController do
         it 'has new object' do
           go
 
-          expect(assigns(:gcp_cluster)).to be_an_instance_of(Clusters::Cluster)
+          expect(assigns(:gcp_cluster)).to be_an_instance_of(Clusters::ClusterPresenter)
         end
       end
 
@@ -143,7 +143,7 @@ describe Projects::ClustersController do
       it 'has new object' do
         go
 
-        expect(assigns(:user_cluster)).to be_an_instance_of(Clusters::Cluster)
+        expect(assigns(:user_cluster)).to be_an_instance_of(Clusters::ClusterPresenter)
       end
     end
 
diff --git a/spec/factories/clusters/platforms/kubernetes.rb b/spec/factories/clusters/platforms/kubernetes.rb
index 4a0d1b181ea..8169c457ab7 100644
--- a/spec/factories/clusters/platforms/kubernetes.rb
+++ b/spec/factories/clusters/platforms/kubernetes.rb
@@ -10,7 +10,7 @@ FactoryBot.define do
       username 'xxxxxx'
       password 'xxxxxx'
 
-      after(:create) do |platform_kubernetes, evaluator|
+      before(:create) do |platform_kubernetes, evaluator|
         pem_file = File.expand_path(Rails.root.join('spec/fixtures/clusters/sample_cert.pem'))
         platform_kubernetes.ca_cert = File.read(pem_file)
       end
diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb
index 2bcccc8184a..f5d261c4e9d 100644
--- a/spec/models/clusters/platforms/kubernetes_spec.rb
+++ b/spec/models/clusters/platforms/kubernetes_spec.rb
@@ -58,6 +58,18 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching
 
         it { is_expected.to be_truthy }
       end
+
+      context 'for group cluster' do
+        let(:namespace) { 'namespace-123' }
+        let(:cluster) { build(:cluster, :group, :provided_by_user) }
+        let(:kubernetes) { cluster.platform_kubernetes }
+
+        before do
+          kubernetes.namespace = namespace
+        end
+
+        it { is_expected.to be_falsey }
+      end
     end
 
     context 'when validates api_url' do
-- 
cgit v1.2.1