diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-04-29 04:03:54 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-04-29 04:03:54 +0000 |
| commit | e5bfd8b9882285f1e0d47866e8c54ecc8cce5704 (patch) | |
| tree | c5a8c288487f7e335e86e5605df8c6a8538e804e | |
| parent | c205973763e9fddd291a65d241002a0769f84106 (diff) | |
| parent | 66de4776aac09661eb7e7484a46f0643494e342c (diff) | |
| download | gitlab-ce-e5bfd8b9882285f1e0d47866e8c54ecc8cce5704.tar.gz | |
Merge branch 'rs-trigger-click' into 'master'
Change from .click -> .trigger('click') to make spec pass
See merge request !10995
| -rw-r--r-- | spec/features/protected_branches/access_control_ce_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/protected_branches_spec.rb | 2 |
2 files changed, 2 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 eb3cea775da..d30e7947106 100644 --- a/spec/features/protected_branches/access_control_ce_spec.rb +++ b/spec/features/protected_branches/access_control_ce_spec.rb @@ -9,7 +9,7 @@ RSpec.shared_examples "protected branches > access control > CE" do allowed_to_push_button = find(".js-allowed-to-push") unless allowed_to_push_button.text == access_type_name - allowed_to_push_button.click + allowed_to_push_button.trigger('click') within(".dropdown.open .dropdown-menu") { click_on access_type_name } end end diff --git a/spec/features/protected_branches_spec.rb b/spec/features/protected_branches_spec.rb index acc5641f930..fc9b293c393 100644 --- a/spec/features/protected_branches_spec.rb +++ b/spec/features/protected_branches_spec.rb @@ -8,7 +8,7 @@ feature 'Projected Branches', feature: true, js: true do before { login_as(user) } def set_protected_branch_name(branch_name) - find(".js-protected-branch-select").click + find(".js-protected-branch-select").trigger('click') find(".dropdown-input-field").set(branch_name) click_on("Create wildcard #{branch_name}") end |