diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-03 18:24:40 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-03 18:24:40 +0000 |
| commit | 907f006c4cab51d942e931226fe874dd0985838b (patch) | |
| tree | 2cde1b83946558b1d3b1fa4f61a3f90f215477ed | |
| parent | df1c933e99dbbc08f7d9fcd4aabcbd790930d3c8 (diff) | |
| parent | 6c9534ba3ec9f7c78b7952e18168db0c3263ecc4 (diff) | |
| download | gitlab-ce-907f006c4cab51d942e931226fe874dd0985838b.tar.gz | |
Merge branch 'further-attempt-to-fix-protected_tags_spec' into 'master'
Try waiting for previous dropdown to definitly close before going to click
See merge request !11070
| -rw-r--r-- | app/views/projects/protected_tags/_create_protected_tag.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/protected_tags/access_control_ce_spec.rb | 4 | ||||
| -rw-r--r-- | spec/features/protected_tags_spec.rb | 1 |
3 files changed, 4 insertions, 3 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..a04fbcdd15f 100644 --- a/spec/features/protected_tags/access_control_ce_spec.rb +++ b/spec/features/protected_tags/access_control_ce_spec.rb @@ -10,8 +10,8 @@ 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) + 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 |