Merge branch 'qa-shl-stablize-protected-tags-spec' into 'master'

Stablize protected tags spec

See merge request gitlab-org/gitlab!35515

app/helpers/dropdowns_helper.rb

@@ -15,7 +15,10 @@ def dropdown_tag(toggle_text, options: {}, &block)
         dropdown_output = dropdown_toggle_link(toggle_text, data_attr, options)
       end
 
-      dropdown_output << content_tag(:div, class: "dropdown-menu dropdown-select #{options[:dropdown_class] if options.key?(:dropdown_class)}") do
+      content_tag_options = { class: "dropdown-menu dropdown-select #{options[:dropdown_class] if options.key?(:dropdown_class)}" }
+      content_tag_options[:data] = { qa_selector: "#{options[:dropdown_qa_selector]}" } if options[:dropdown_qa_selector]
+
+      dropdown_output << content_tag(:div, content_tag_options) do
         output = []
 
         if options.key?(:title)

app/views/projects/protected_tags/_create_protected_tag.html.haml

 - content_for :create_access_levels do
-  .create_access_levels-container{ data: { qa_selector: 'access_levels_content' } }
+  .create_access_levels-container
     = dropdown_tag('Select',
                    options: { toggle_class: 'js-allowed-to-create wide',
                    dropdown_class: 'dropdown-menu-selectable capitalize-header',
+                   dropdown_qa_selector: 'access_levels_content',
                    data: { field_name: 'protected_tag[create_access_levels_attributes][0][access_level]', input_id: 'create_access_levels_attributes', qa_selector: 'access_levels_dropdown' }})
 
 = render 'projects/protected_tags/shared/create_protected_tag'

ee/app/views/projects/protected_tags/ee/_create_protected_tag.html.haml

 - content_for :create_access_levels do
-  .create_access_levels-container{ data: { qa_selector: 'access_levels_content' } }
+  .create_access_levels-container
     = dropdown_tag('Select',
                    options: { toggle_class: 'js-allowed-to-create js-multiselect wide',
                    dropdown_class: 'dropdown-menu-user dropdown-menu-selectable capitalize-header', filter: true,
+                   dropdown_qa_selector: 'access_levels_content',
                    data: { input_id: 'create_access_levels_attributes', default_label: 'Select', qa_selector: 'access_levels_dropdown' } })
   .form-text.text-muted
     Only groups that

qa/qa/page/project/settings/protected_tags.rb

@@ -26,6 +26,8 @@ def set_tag(tag_name)
           end
 
           def choose_access_level_role(role)
+            return if find_element(:access_levels_dropdown).text == role
+
             click_element :access_levels_dropdown
             within_element(:access_levels_content) do
               click_on role