Merge branch...

Merge branch 'ee-43472-remove-environment-scope-field-on-cluster-creation-form-for-core-starter-plans' into 'master'

Adds a test for the environment scope field

See merge request gitlab-org/gitlab-ee!6314

app/views/projects/clusters/user/_form.html.haml

@@ -3,9 +3,10 @@
   .form-group
     = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-light'
     = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name')
-  .form-group
-    = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-light'
-    = field.text_field :environment_scope, class: 'form-control', readonly: !has_multiple_clusters?(@project), placeholder: s_('ClusterIntegration|Environment scope')
+  - if has_multiple_clusters?(@project)
+    .form-group
+      = field.label :environment_scope, s_('ClusterIntegration|Environment scope'), class: 'label-light'
+      = field.text_field :environment_scope, class: 'form-control', placeholder: s_('ClusterIntegration|Environment scope')
 
   = field.fields_for :platform_kubernetes, @cluster.platform_kubernetes do |platform_kubernetes_field|
     .form-group

ee/spec/features/projects/clusters/gcp_spec.rb

+require 'spec_helper'
+
+feature 'Gcp Cluster', :js do
+  include GoogleApi::CloudPlatformHelpers
+
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+
+  before do
+    project.add_master(user)
+    gitlab_sign_in(user)
+    allow(Projects::ClustersController).to receive(:STATUS_POLLING_INTERVAL) { 100 }
+  end
+
+  context 'when a user has a licence to use multiple clusers' do
+    before do
+      stub_licensed_features(multiple_clusters: true)
+      visit project_clusters_path(project)
+
+      click_link 'Add Kubernetes cluster'
+      click_link 'Add an existing Kubernetes cluster'
+    end
+
+    it 'user sees the "Environment scope" field' do
+      expect(page).to have_css('#cluster_environment_scope')
+    end
+  end
+end

spec/features/projects/clusters/gcp_spec.rb

@@ -157,6 +157,19 @@ feature 'Gcp Cluster', :js do
     end
   end
 
+  context 'when a user cannot edit the environment scope' do
+    before do
+      visit project_clusters_path(project)
+
+      click_link 'Add Kubernetes cluster'
+      click_link 'Add an existing Kubernetes cluster'
+    end
+
+    it 'user does not see the "Environment scope" field' do
+      expect(page).not_to have_css('#cluster_environment_scope')
+    end
+  end
+
   context 'when user has not dismissed GCP signup offer' do
     before do
       visit project_clusters_path(project)