summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-03 16:22:28 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-05-03 16:22:28 +0100
commit42b5decd66421005c7b936866d3e4c3fb64eb6ea (patch)
tree3c678a627c7e21a9df4d8603eae3f5c424c54ea7 /spec/features
parentf30ab49433c5fc8ee088d2795d02c9340ff5b06c (diff)
downloadgitlab-ce-42b5decd66421005c7b936866d3e4c3fb64eb6ea.tar.gz
Try waiting for previous dropdown to definitly close before going to click
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/protected_tags/access_control_ce_spec.rb7
-rw-r--r--spec/features/protected_tags_spec.rb1
2 files changed, 5 insertions, 3 deletions
diff --git a/spec/features/protected_tags/access_control_ce_spec.rb b/spec/features/protected_tags/access_control_ce_spec.rb
index 5b24ac0292b..4cc9c8f1242 100644
--- a/spec/features/protected_tags/access_control_ce_spec.rb
+++ b/spec/features/protected_tags/access_control_ce_spec.rb
@@ -1,6 +1,6 @@
RSpec.shared_examples "protected tags > access control > CE" do
ProtectedTag::CreateAccessLevel.human_access_levels.each do |(access_type_id, access_type_name)|
- it "allows creating protected tags that #{access_type_name} can create" do
+ it "allows creating protected tags that #{access_type_name} can create", :js do
visit namespace_project_protected_tags_path(project.namespace, project)
set_protected_tag_name('master')
@@ -10,8 +10,9 @@ RSpec.shared_examples "protected tags > access control > CE" do
unless allowed_to_create_button.text == access_type_name
allowed_to_create_button.click
- find('.dropdown.open .dropdown-menu li', match: :first)
- within(".dropdown.open .dropdown-menu") { click_on access_type_name }
+ find('.create_access_levels-container .dropdown-menu li', match: :first)
+ screenshot_and_open_image
+ within('.create_access_levels-container .dropdown-menu') { click_on access_type_name }
end
end
diff --git a/spec/features/protected_tags_spec.rb b/spec/features/protected_tags_spec.rb
index e3aa87ded28..e68448467b0 100644
--- a/spec/features/protected_tags_spec.rb
+++ b/spec/features/protected_tags_spec.rb
@@ -11,6 +11,7 @@ feature 'Projected Tags', feature: true, js: true do
find(".js-protected-tag-select").click
find(".dropdown-input-field").set(tag_name)
click_on("Create wildcard #{tag_name}")
+ find('.protected-tags-dropdown .dropdown-menu', visible: false)
end
describe "explicit protected tags" do