Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/features/clusters/cluster_detail_page_spec.rb b/spec/features/clusters/cluster_detail_page_spec.rb
index 6fe6c099d80..84a18a45d35 100644
--- a/spec/features/clusters/cluster_detail_page_spec.rb
+++ b/spec/features/clusters/cluster_detail_page_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'Clusterable > Show page' do
     it 'allow the user to set domain', :js do
       visit cluster_path
 
-      within '.js-cluster-integration-form' do
+      within '.js-cluster-details-form' do
         fill_in('cluster_base_domain', with: 'test.com')
         click_on 'Save changes'
       end
@@ -39,7 +39,7 @@ RSpec.describe 'Clusterable > Show page' do
       end
 
       it 'shows help text with the domain as an alternative to custom domain', :js do
-        within '.js-cluster-integration-form' do
+        within '.js-cluster-details-form' do
           expect(find(cluster_ingress_help_text_selector).text).to include('192.168.1.100')
         end
       end
@@ -49,7 +49,7 @@ RSpec.describe 'Clusterable > Show page' do
       it 'alternative to custom domain is not shown' do
         visit cluster_path
 
-        within '.js-cluster-integration-form' do
+        within '.js-cluster-details-form' do
           expect(page).not_to have_selector(cluster_ingress_help_text_selector)
         end
       end
diff --git a/spec/features/clusters/cluster_health_dashboard_spec.rb b/spec/features/clusters/cluster_health_dashboard_spec.rb
index e9e3b48e9c0..862f34768c4 100644
--- a/spec/features/clusters/cluster_health_dashboard_spec.rb
+++ b/spec/features/clusters/cluster_health_dashboard_spec.rb
@@ -33,7 +33,7 @@ RSpec.describe 'Cluster Health board', :js, :kubeclient, :use_clean_rails_memory
 
       click_link 'Health'
 
-      expect(page).to have_text('you must first install Prometheus in the Applications tab')
+      expect(page).to have_text('you must first enable Prometheus in the Integrations tab')
     end
   end