diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2017-10-06 05:16:17 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2017-10-06 05:16:17 +0000 |
commit | 9560d5b8399df42109e5768f19a99d0d5a664bd9 (patch) | |
tree | a9e566b008bce2827afda0b29d53be8c9c8c4c61 | |
parent | 64a6552b51fa474ea09b55182896e45b5e41410a (diff) | |
parent | 10dfa99342f153e6c9c87c85fd05da884d2c37b4 (diff) | |
download | gitlab-ce-9560d5b8399df42109e5768f19a99d0d5a664bd9.tar.gz |
Merge branch '38835-protected-branch-selector-not-found-in-test' into 'master'
Resolve "Protected branch selector not found in test"
Closes #38835
See merge request gitlab-org/gitlab-ce!14719
-rw-r--r-- | spec/features/protected_branches_spec.rb | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb index 44c20d4a8d5..aaf3d6d28ca 100644 --- a/spec/features/protected_branches_spec.rb +++ b/spec/features/protected_branches_spec.rb @@ -60,6 +60,23 @@ feature 'Protected Branches', :js do expect(page).to have_content('No branches to show') end end + + 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") + end + page.within(".js-allowed-to-push") do + expect(page.find(".dropdown-toggle-text")).to have_content("Developers + Masters") + end + end + end end context 'logged in as admin' do @@ -150,22 +167,4 @@ feature 'Protected Branches', :js do find(".dropdown-input-field").set(branch_name) click_on("Create wildcard #{branch_name}") end - - 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) - set_protected_branch_name('some-branch') - 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") - end - page.within(".js-allowed-to-push") do - expect(page.find(".dropdown-toggle-text")).to have_content("Developers + Masters") - end - end - end end |