Merge branch 'backport-protected-branches-spec-changes' into 'master'

Backport protected_branches_spec improvements from EE

See merge request gitlab-org/gitlab-ce!14745

spec/features/protected_branches_spec.rb

@@ -64,11 +64,18 @@ feature 'Protected Branches', :js do
     describe "Saved defaults" do
       it "keeps the allowed to merge and push dropdowns defaults based on the previous selection" do
         visit project_protected_branches_path(project)
+        form = '.js-new-protected-branch'
+
+        within form do
           find(".js-allowed-to-merge").trigger('click')
           click_link 'No one'
           find(".js-allowed-to-push").trigger('click')
           click_link 'Developers + Masters'
+        end
+
         visit project_protected_branches_path(project)
+
+        within form do
           page.within(".js-allowed-to-merge") do
             expect(page.find(".dropdown-toggle-text")).to have_content("No one")
           end
@@ -78,6 +85,7 @@ feature 'Protected Branches', :js do
         end
       end
     end
+  end
 
   context 'logged in as admin' do
     before do