Merge branch 'mk/fix-flaky-protected-branch-expectations-ee' into 'master'

[EE Port] QA: Remove flaky and redundant expectations

See merge request gitlab-org/gitlab-ee!6505

app/views/projects/protected_branches/_update_protected_branch.html.haml

@@ -6,5 +6,5 @@
 %td
   = hidden_field_tag "allowed_to_push_#{protected_branch.id}", protected_branch.push_access_levels.first.access_level
   = dropdown_tag( (protected_branch.push_access_levels.first.humanize || 'Select') ,
-                 options: { toggle_class: 'js-allowed-to-push qa-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container capitalize-header',
+                 options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container capitalize-header',
                  data: { field_name: "allowed_to_push_#{protected_branch.id}", access_level_id: protected_branch.push_access_levels.first.id }})

app/views/projects/protected_branches/shared/_protected_branch.html.haml

@@ -2,7 +2,7 @@
 
 %tr.js-protected-branch-edit-form{ data: { url: namespace_project_protected_branch_path(@project.namespace, @project, protected_branch) } }
   %td
-    %span.ref-name.qa-protected-branch-name= protected_branch.name
+    %span.ref-name= protected_branch.name
 
     - if @project.root_ref?(protected_branch.name)
       %span.badge.badge-info.prepend-left-5 default

ee/app/views/projects/protected_branches/ee/_fallback_update_protected_branch.html.haml

@@ -28,7 +28,7 @@
 %td
   = hidden_field_tag "allowed_to_push_#{protected_branch.id}", push_access_level&.access_level
   = dropdown_tag( (push_access_level&.humanize || 'Select') ,
-                 options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container capitalize-header qa-allowed-to-push',
+                 options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container capitalize-header',
                  data: { field_name: "allowed_to_push_#{protected_branch.id}", access_level_id: push_access_level&.id }})
   - if user_push_access_levels.any?
     %p.small

ee/app/views/projects/protected_branches/ee/_protected_branch_access_summary.html.haml

@@ -4,4 +4,4 @@
   = render partial: 'projects/settings/ee/access_level_dropdown', locals: { protected_branch: protected_branch, access_levels: protected_branch.merge_access_levels, level_frequencies: access_level_frequencies(protected_branch.merge_access_levels), input_basic_name: 'merge_access_levels', disabled: !can_unprotect, toggle_class: 'js-allowed-to-merge qa-allowed-to-merge' }
 
 %td
-  = render partial: 'projects/settings/ee/access_level_dropdown', locals: { protected_branch: protected_branch, access_levels: protected_branch.push_access_levels, level_frequencies: access_level_frequencies(protected_branch.push_access_levels), input_basic_name: 'push_access_levels', disabled: !can_unprotect, toggle_class: 'js-allowed-to-push qa-allowed-to-push' }
+  = render partial: 'projects/settings/ee/access_level_dropdown', locals: { protected_branch: protected_branch, access_levels: protected_branch.push_access_levels, level_frequencies: access_level_frequencies(protected_branch.push_access_levels), input_basic_name: 'push_access_levels', disabled: !can_unprotect, toggle_class: 'js-allowed-to-push' }

qa/qa/ee/page/project/settings/protected_branches.rb

@@ -14,7 +14,6 @@ module QA
                 end
 
                 view 'ee/app/views/projects/protected_branches/ee/_protected_branch_access_summary.html.haml' do
-                  element :allowed_to_push
                   element :allowed_to_merge
                 end
               end

qa/qa/factory/resource/branch.rb

@@ -9,18 +9,6 @@ module QA
           project.name = 'protected-branch-project'
         end
 
-        product :name do
-          Page::Project::Settings::Repository.act do
-            expand_protected_branches(&:last_branch_name)
-          end
-        end
-
-        product :push_allowance do
-          Page::Project::Settings::Repository.act do
-            expand_protected_branches(&:last_push_allowance)
-          end
-        end
-
         def initialize
           @branch_name = 'test/branch'
           @allow_to_push = true
@@ -80,15 +68,6 @@ module QA
               end
 
               page.protect_branch
-
-              # Avoid Selenium::WebDriver::Error::StaleElementReferenceError
-              # without sleeping. I.e. this completes fast on fast machines.
-              page.refresh
-
-              # It is possible for the protected branch row to "disappear" at first
-              page.wait do
-                page.has_content?(branch_name)
-              end
             end
           end
         end

qa/qa/page/project/settings/protected_branches.rb

@@ -18,7 +18,6 @@ module QA
           end
 
           view 'app/views/projects/protected_branches/_update_protected_branch.html.haml' do
-            element :allowed_to_push
             element :allowed_to_merge
           end
 
@@ -26,10 +25,6 @@ module QA
             element :protected_branches_list
           end
 
-          view 'app/views/projects/protected_branches/shared/_protected_branch.html.haml' do
-            element :protected_branch_name
-          end
-
           def select_branch(branch_name)
             click_element :protected_branch_select
 
@@ -64,18 +59,6 @@ module QA
             click_on 'Protect'
           end
 
-          def last_branch_name
-            within_element(:protected_branches_list) do
-              all('.qa-protected-branch-name').last
-            end
-          end
-
-          def last_push_allowance
-            within_element(:protected_branches_list) do
-              all('.qa-allowed-to-push').last
-            end
-          end
-
           private
 
           def click_allow(action, text)

qa/qa/specs/features/repository/protected_branches_spec.rb

@@ -21,11 +21,8 @@ module QA
     end
 
     context 'when developers and maintainers are allowed to push to a protected branch' do
-      let!(:protected_branch) { create_protected_branch(allow_to_push: true) }
-
       it 'user with push rights successfully pushes to the protected branch' do
-        expect(protected_branch.name).to have_content(branch_name)
-        expect(protected_branch.push_allowance).to have_content('Developers + Maintainers')
+        create_protected_branch(allow_to_push: true)
 
         push = push_new_file(branch_name)