diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 18:10:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-28 18:10:21 +0300 |
commit | c41b66bd0510571d6a426ec6c701278ecd79b683 (patch) | |
tree | caa800f1d461aec59ff9b733058ef56ed9856769 /spec/features/projects | |
parent | 9f8061811b2ab29fc6e48a8845eaf531b40d037a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/projects')
-rw-r--r-- | spec/features/projects/clusters/gcp_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/clusters/user_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/clusters_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/projects/view_on_env_spec.rb | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb index 63e5546b43c..04339d20d77 100644 --- a/spec/features/projects/clusters/gcp_spec.rb +++ b/spec/features/projects/clusters/gcp_spec.rb @@ -144,7 +144,7 @@ RSpec.describe 'Gcp Cluster', :js, :do_not_mock_admin_mode do visit project_clusters_path(project) click_link 'Add Kubernetes cluster' - click_link 'Add existing cluster' + click_link 'Connect existing cluster' end it 'user sees the "Environment scope" field' do diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb index 450eaa7f004..9d0dc65093e 100644 --- a/spec/features/projects/clusters/user_spec.rb +++ b/spec/features/projects/clusters/user_spec.rb @@ -26,7 +26,7 @@ RSpec.describe 'User Cluster', :js do visit project_clusters_path(project) click_link 'Add Kubernetes cluster' - click_link 'Add existing cluster' + click_link 'Connect existing cluster' end context 'when user filled form with valid parameters' do diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb index c56a1ed1711..d674fbc457e 100644 --- a/spec/features/projects/clusters_spec.rb +++ b/spec/features/projects/clusters_spec.rb @@ -43,7 +43,7 @@ RSpec.describe 'Clusters', :js do context 'when user filled form with environment scope' do before do click_link 'Add Kubernetes cluster' - click_link 'Add existing cluster' + click_link 'Connect existing cluster' fill_in 'cluster_name', with: 'staging-cluster' fill_in 'cluster_environment_scope', with: 'staging/*' click_button 'Add Kubernetes cluster' @@ -72,7 +72,7 @@ RSpec.describe 'Clusters', :js do context 'when user updates duplicated environment scope' do before do click_link 'Add Kubernetes cluster' - click_link 'Add existing cluster' + click_link 'Connect existing cluster' fill_in 'cluster_name', with: 'staging-cluster' fill_in 'cluster_environment_scope', with: '*' fill_in 'cluster_platform_kubernetes_attributes_api_url', with: 'https://0.0.0.0' diff --git a/spec/features/projects/view_on_env_spec.rb b/spec/features/projects/view_on_env_spec.rb index 6f78f888c12..d220db01c24 100644 --- a/spec/features/projects/view_on_env_spec.rb +++ b/spec/features/projects/view_on_env_spec.rb @@ -9,8 +9,6 @@ RSpec.describe 'View on environment', :js do let(:user) { project.creator } before do - stub_feature_flags(diffs_batch_load: false) - project.add_maintainer(user) end |