Resolve "Remove "environment scope" field on cluster creation form for core/starter plans"

This commit is contained in:
Sam Beckham 2018-06-29 08:26:56 +00:00 committed by Phil Hughes
parent 786cbfa174
commit 7a6da82a83
3 changed files with 22 additions and 3 deletions

View file

@ -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

View file

@ -0,0 +1,5 @@
---
title: Removes the environment scope field for users that cannot edit it
merge_request: 19643
author:
type: changed

View file

@ -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)