Merge branch 'fix-protected_branches_spec-master-ee' into 'master'

Fix protected branch example failing on master

Closes #11136

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

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

 - can_admin_project = can?(current_user, :admin_project, @project)
 
-%tr.js-protected-branch-edit-form{ data: { url: namespace_project_protected_branch_path(@project.namespace, @project, protected_branch) } }
+%tr.qa-protected-branch.js-protected-branch-edit-form{ data: { url: namespace_project_protected_branch_path(@project.namespace, @project, protected_branch) } }
   %td
     %span.ref-name= protected_branch.name
 

ee/spec/support/shared_examples/features/protected_branches_access_control.rb

@@ -177,9 +177,9 @@ shared_examples "protected branches > access control > EE" do
     it 'unprotect/delete can be performed by a maintainer' do
       visit project_protected_branches_path(project)
 
-      expect do
-        accept_alert { click_on 'Unprotect' }
-      end.to change(ProtectedBranch, :count).to(0)
+      expect(page).to have_selector('.qa-protected-branch')
+      accept_alert { click_on 'Unprotect' }
+      expect(page).not_to have_selector('.qa-protected-branch')
     end
 
     context 'with unprotect access levels' do