summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/diff_notes_resolve_spec.rb
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-03-14 00:02:30 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-03-28 11:09:12 -0500
commitcf3c43980d3911e32d767158420400d75edf3968 (patch)
tree18741697d64bf26a98e8e15b005062ecb4b454ed /spec/features/merge_requests/diff_notes_resolve_spec.rb
parent6460489babe3cd25358800804f6befc1bd242f22 (diff)
downloadgitlab-ce-cf3c43980d3911e32d767158420400d75edf3968.tar.gz
Fix link togglers jumping to top
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29414
Diffstat (limited to 'spec/features/merge_requests/diff_notes_resolve_spec.rb')
-rw-r--r--spec/features/merge_requests/diff_notes_resolve_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb
index d5e3d8e7eff..69164aabdb2 100644
--- a/spec/features/merge_requests/diff_notes_resolve_spec.rb
+++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb
@@ -296,7 +296,7 @@ feature 'Diff notes resolve', feature: true, js: true do
it 'displays next discussion even if hidden' do
page.all('.note-discussion').each do |discussion|
page.within discussion do
- click_link 'Toggle discussion'
+ click_button 'Toggle discussion'
end
end
@@ -477,13 +477,13 @@ feature 'Diff notes resolve', feature: true, js: true do
it 'shows resolved icon' do
expect(page).to have_content '1/1 discussion resolved'
- click_link 'Toggle discussion'
+ click_button 'Toggle discussion'
expect(page).to have_selector('.line-resolve-btn.is-active')
end
it 'does not allow user to click resolve button' do
expect(page).to have_selector('.line-resolve-btn.is-disabled')
- click_link 'Toggle discussion'
+ click_button 'Toggle discussion'
expect(page).to have_selector('.line-resolve-btn.is-disabled')
end