diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-20 12:06:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-20 12:06:17 +0300 |
commit | 8ac91ecfd1bb445a0a1572b3c0885c41c9037e8a (patch) | |
tree | 4b8c9d2a99ad50ef84421b57758869863ea477a2 /spec/features/clusters | |
parent | 7e20809103e1f9c0c96c3a96705224c81bf448d5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/clusters')
-rw-r--r-- | spec/features/clusters/cluster_detail_page_spec.rb | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/spec/features/clusters/cluster_detail_page_spec.rb b/spec/features/clusters/cluster_detail_page_spec.rb index 683c57a97f8..927862689c1 100644 --- a/spec/features/clusters/cluster_detail_page_spec.rb +++ b/spec/features/clusters/cluster_detail_page_spec.rb @@ -13,7 +13,7 @@ describe 'Clusterable > Show page' do sign_in(current_user) end - shared_examples 'editing domain' do + shared_examples 'show page' do before do clusterable.add_maintainer(current_user) end @@ -53,6 +53,12 @@ describe 'Clusterable > Show page' do end end end + + it 'does not show the environments tab' do + visit cluster_path + + expect(page).not_to have_selector('.js-cluster-nav-environments', text: 'Environments') + end end shared_examples 'editing a GCP cluster' do @@ -113,42 +119,30 @@ describe 'Clusterable > Show page' do end context 'when clusterable is a project' do - it_behaves_like 'editing domain' do - let(:clusterable) { create(:project) } - let(:cluster) { create(:cluster, :provided_by_gcp, :project, projects: [clusterable]) } - let(:cluster_path) { project_cluster_path(clusterable, cluster) } - end + let(:clusterable) { create(:project) } + let(:cluster_path) { project_cluster_path(clusterable, cluster) } + let(:cluster) { create(:cluster, :provided_by_gcp, :project, projects: [clusterable]) } - it_behaves_like 'editing a GCP cluster' do - let(:clusterable) { create(:project) } - let(:cluster) { create(:cluster, :provided_by_gcp, :project, projects: [clusterable]) } - let(:cluster_path) { project_cluster_path(clusterable, cluster) } - end + it_behaves_like 'show page' + + it_behaves_like 'editing a GCP cluster' it_behaves_like 'editing a user-provided cluster' do - let(:clusterable) { create(:project) } let(:cluster) { create(:cluster, :provided_by_user, :project, projects: [clusterable]) } - let(:cluster_path) { project_cluster_path(clusterable, cluster) } end end context 'when clusterable is a group' do - it_behaves_like 'editing domain' do - let(:clusterable) { create(:group) } - let(:cluster) { create(:cluster, :provided_by_gcp, :group, groups: [clusterable]) } - let(:cluster_path) { group_cluster_path(clusterable, cluster) } - end + let(:clusterable) { create(:group) } + let(:cluster_path) { group_cluster_path(clusterable, cluster) } + let(:cluster) { create(:cluster, :provided_by_gcp, :group, groups: [clusterable]) } - it_behaves_like 'editing a GCP cluster' do - let(:clusterable) { create(:group) } - let(:cluster) { create(:cluster, :provided_by_gcp, :group, groups: [clusterable]) } - let(:cluster_path) { group_cluster_path(clusterable, cluster) } - end + it_behaves_like 'show page' + + it_behaves_like 'editing a GCP cluster' it_behaves_like 'editing a user-provided cluster' do - let(:clusterable) { create(:group) } let(:cluster) { create(:cluster, :provided_by_user, :group, groups: [clusterable]) } - let(:cluster_path) { group_cluster_path(clusterable, cluster) } end end end |