summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-01-25 09:29:22 +0000
committerPhil Hughes <me@iamphill.com>2017-01-26 16:04:59 +0000
commit860c8cfc35956adba73c38b9b21be5c58069ba81 (patch)
tree42e48e098952a1011eb7360ba9c2d6cf1464c53f /spec/features
parentfadeefb688a4f98990df3849ef3fc8fa14dacf29 (diff)
downloadgitlab-ce-860c8cfc35956adba73c38b9b21be5c58069ba81.tar.gz
Added header to protected branches access dropdownsprotected-branch-dropdown-titles
CE part of https://gitlab.com/gitlab-org/gitlab-ee/issues/1294
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/protected_branches/access_control_ce_spec.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/spec/features/protected_branches/access_control_ce_spec.rb b/spec/features/protected_branches/access_control_ce_spec.rb
index 395c61a4743..e4aca25a339 100644
--- a/spec/features/protected_branches/access_control_ce_spec.rb
+++ b/spec/features/protected_branches/access_control_ce_spec.rb
@@ -26,7 +26,11 @@ RSpec.shared_examples "protected branches > access control > CE" do
within(".protected-branches-list") do
find(".js-allowed-to-push").click
- within('.js-allowed-to-push-container') { click_on access_type_name }
+
+ within('.js-allowed-to-push-container') do
+ expect(first("li")).to have_content("Roles")
+ click_on access_type_name
+ end
end
wait_for_ajax
@@ -61,7 +65,11 @@ RSpec.shared_examples "protected branches > access control > CE" do
within(".protected-branches-list") do
find(".js-allowed-to-merge").click
- within('.js-allowed-to-merge-container') { click_on access_type_name }
+
+ within('.js-allowed-to-merge-container') do
+ expect(first("li")).to have_content("Roles")
+ click_on access_type_name
+ end
end
wait_for_ajax