This instance will be upgraded to Heptapod 0.31.0 (final) on 2022-05-24 at 14:00 UTC+2 (a few minutes of down time)

Commit b4f9dc48 authored by Mike Greiling's avatar Mike Greiling
Browse files

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

Backport protected_branches_spec improvements from EE

See merge request gitlab-org/gitlab-ce!14745
...@@ -64,16 +64,24 @@ ...@@ -64,16 +64,24 @@
describe "Saved defaults" do describe "Saved defaults" do
it "keeps the allowed to merge and push dropdowns defaults based on the previous selection" do it "keeps the allowed to merge and push dropdowns defaults based on the previous selection" do
visit project_protected_branches_path(project) visit project_protected_branches_path(project)
find(".js-allowed-to-merge").trigger('click') form = '.js-new-protected-branch'
click_link 'No one'
find(".js-allowed-to-push").trigger('click') within form do
click_link 'Developers + Masters' find(".js-allowed-to-merge").trigger('click')
visit project_protected_branches_path(project) click_link 'No one'
page.within(".js-allowed-to-merge") do find(".js-allowed-to-push").trigger('click')
expect(page.find(".dropdown-toggle-text")).to have_content("No one") click_link 'Developers + Masters'
end 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 end
end end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment