Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 3 deletions

diff --git a/qa/qa/flow/saml.rb b/qa/qa/flow/saml.rb
index 676be2beb01..e8007978071 100644
--- a/qa/qa/flow/saml.rb
+++ b/qa/qa/flow/saml.rb
@@ -18,7 +18,7 @@ module QA
         end
       end
 
-      def enable_saml_sso(group, saml_idp_service)
+      def enable_saml_sso(group, saml_idp_service, default_membership_role = 'Guest')
         page.visit Runtime::Scenario.gitlab_address
 
         Page::Main::Login.perform(&:sign_in_using_credentials) unless Page::Main::Menu.perform(&:signed_in?)
@@ -29,6 +29,7 @@ module QA
           EE::Page::Group::Settings::SamlSSO.perform do |saml_sso|
             saml_sso.set_id_provider_sso_url(saml_idp_service.idp_sso_url)
             saml_sso.set_cert_fingerprint(saml_idp_service.idp_certificate_fingerprint)
+            saml_sso.set_default_membership_role(default_membership_role)
             saml_sso.click_save_changes
 
             saml_sso.user_login_url_link_text
diff --git a/qa/qa/page/project/operations/metrics/show.rb b/qa/qa/page/project/operations/metrics/show.rb
index ee5f42147f6..7576e11bf59 100644
--- a/qa/qa/page/project/operations/metrics/show.rb
+++ b/qa/qa/page/project/operations/metrics/show.rb
@@ -18,9 +18,12 @@ module QA
             view 'app/assets/javascripts/monitoring/components/dashboard_header.vue' do
               element :dashboards_filter_dropdown
               element :environments_dropdown
-              element :edit_dashboard_button
               element :range_picker_dropdown
+            end
+
+            view 'app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue' do
               element :actions_menu_dropdown
+              element :edit_dashboard_button_enabled
             end
 
             view 'app/assets/javascripts/monitoring/components/duplicate_dashboard_form.vue' do
@@ -56,7 +59,7 @@ module QA
 
             def has_edit_dashboard_enabled?
               within_element :prometheus_graphs do
-                has_element? :edit_dashboard_button
+                has_element? :edit_dashboard_button_enabled
               end
             end