From 42b5decd66421005c7b936866d3e4c3fb64eb6ea Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 3 May 2017 16:22:28 +0100 Subject: Try waiting for previous dropdown to definitly close before going to click --- app/views/projects/protected_tags/_create_protected_tag.html.haml | 2 +- spec/features/protected_tags/access_control_ce_spec.rb | 7 ++++--- spec/features/protected_tags_spec.rb | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/projects/protected_tags/_create_protected_tag.html.haml b/app/views/projects/protected_tags/_create_protected_tag.html.haml index 6e187b54a59..af9a080f0a2 100644 --- a/app/views/projects/protected_tags/_create_protected_tag.html.haml +++ b/app/views/projects/protected_tags/_create_protected_tag.html.haml @@ -9,7 +9,7 @@ .form-group = f.label :name, class: 'col-md-2 text-right' do Tag: - .col-md-10 + .col-md-10.protected-tags-dropdown = render partial: "projects/protected_tags/dropdown", locals: { f: f } .help-block = link_to 'Wildcards', help_page_path('user/project/protected_tags', anchor: 'wildcard-protected-tags') 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 -- cgit v1.2.1 From 6c9534ba3ec9f7c78b7952e18168db0c3263ecc4 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 3 May 2017 16:35:49 +0100 Subject: remove debug code --- spec/features/protected_tags/access_control_ce_spec.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/spec/features/protected_tags/access_control_ce_spec.rb b/spec/features/protected_tags/access_control_ce_spec.rb index 4cc9c8f1242..a04fbcdd15f 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", :js do + it "allows creating protected tags that #{access_type_name} can create" do visit namespace_project_protected_tags_path(project.namespace, project) set_protected_tag_name('master') @@ -11,7 +11,6 @@ RSpec.shared_examples "protected tags > access control > CE" do unless allowed_to_create_button.text == access_type_name allowed_to_create_button.click 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 -- cgit v1.2.1