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

spec/features/protected_branches_spec.rb

@@ -64,16 +64,24 @@ 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)
-        find(".js-allowed-to-merge").trigger('click')
-        click_link 'No one'
-        find(".js-allowed-to-push").trigger('click')
-        click_link 'Developers + Masters'
-        visit project_protected_branches_path(project)
-        page.within(".js-allowed-to-merge") do
-          expect(page.find(".dropdown-toggle-text")).to have_content("No one")
+        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
-        page.within(".js-allowed-to-push") do
-          expect(page.find(".dropdown-toggle-text")).to have_content("Developers + Masters")
+
+        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
+          page.within(".js-allowed-to-push") do
+            expect(page.find(".dropdown-toggle-text")).to have_content("Developers + Masters")
+          end
         end
       end
     end