diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-10-06 23:06:35 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-10-06 23:06:35 +0000 |
commit | b4f9dc48163c065d776d120dd312c689ce79f653 (patch) | |
tree | ca8568a30203921e97963fb258a93281426db717 | |
parent | 18b2079a5811e4399671e29efc70c0ed6038b8dc (diff) | |
parent | 26b66e58ca4179ab8720f48c72e75aa3bac05911 (diff) | |
download | gitlab-ce-b4f9dc48163c065d776d120dd312c689ce79f653.tar.gz |
Merge branch 'backport-protected-branches-spec-changes' into 'master'
Backport protected_branches_spec improvements from EE
See merge request gitlab-org/gitlab-ce!14745
-rw-r--r-- | spec/features/protected_branches_spec.rb | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb index aaf3d6d28ca..2ab1eda90f1 100644 --- a/spec/features/protected_branches_spec.rb +++ b/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 |