Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/features/clusters/cluster_detail_page_spec.rb b/spec/features/clusters/cluster_detail_page_spec.rb
index 4f7f62d00a5..31d6bcda9e8 100644
--- a/spec/features/clusters/cluster_detail_page_spec.rb
+++ b/spec/features/clusters/cluster_detail_page_spec.rb
@@ -87,6 +87,7 @@ RSpec.describe 'Clusterable > Show page' do
       within('#advanced-settings-section') do
         expect(page).to have_content('Google Kubernetes Engine')
         expect(page).to have_content('Manage your Kubernetes cluster by visiting')
+        expect_common_advanced_options
       end
     end
   end
@@ -117,6 +118,7 @@ RSpec.describe 'Clusterable > Show page' do
       within('#advanced-settings-section') do
         expect(page).not_to have_content('Google Kubernetes Engine')
         expect(page).not_to have_content('Manage your Kubernetes cluster by visiting')
+        expect_common_advanced_options
       end
     end
   end
@@ -176,4 +178,14 @@ RSpec.describe 'Clusterable > Show page' do
       let(:cluster) { create(:cluster, :provided_by_user, :instance) }
     end
   end
+
+  private
+
+  def expect_common_advanced_options
+    aggregate_failures do
+      expect(page).to have_content('Cluster management project')
+      expect(page).to have_content('Clear cluster cache')
+      expect(page).to have_content('Remove Kubernetes cluster integration')
+    end
+  end
 end