summaryrefslogtreecommitdiff
path: root/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-05-28 20:01:56 +0900
committerShinya Maeda <shinya@gitlab.com>2018-05-28 20:01:56 +0900
commit1d20679e9c8b1ba16bebaf982255946e7207b4d4 (patch)
tree128685af66ca56c751b505a8314ca79dd3b54b34 /spec/support/shared_examples/features/protected_branches_access_control_ce.rb
parent8e92e25b62ca108de775362e6d2981e54535f094 (diff)
parent014f5f6a69f63ee42bd94454108268f189b62b18 (diff)
downloadgitlab-ce-1d20679e9c8b1ba16bebaf982255946e7207b4d4.tar.gz
Merge branch 'master' into per-project-pipeline-iid
Diffstat (limited to 'spec/support/shared_examples/features/protected_branches_access_control_ce.rb')
-rw-r--r--spec/support/shared_examples/features/protected_branches_access_control_ce.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/shared_examples/features/protected_branches_access_control_ce.rb b/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
index 17f319f49e9..5241c0fa6f1 100644
--- a/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
+++ b/spec/support/shared_examples/features/protected_branches_access_control_ce.rb
@@ -10,7 +10,7 @@ shared_examples "protected branches > access control > CE" do
unless allowed_to_push_button.text == access_type_name
allowed_to_push_button.click
- within(".dropdown.open .dropdown-menu") { click_on access_type_name }
+ within(".dropdown.show .dropdown-menu") { click_on access_type_name }
end
end
@@ -55,7 +55,7 @@ shared_examples "protected branches > access control > CE" do
unless allowed_to_merge_button.text == access_type_name
allowed_to_merge_button.click
- within(".dropdown.open .dropdown-menu") { click_on access_type_name }
+ within(".dropdown.show .dropdown-menu") { click_on access_type_name }
end
end