summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-10-24 15:29:37 +0300
committerMike Greiling <mike@pixelcog.com>2017-10-24 15:29:37 +0300
commit01605bc78c57e3c6e1fbdb5d2397e1ebf78d7b2b (patch)
tree7abce39908d2e12277eda1049733fd2f1ec55e52 /spec/features/merge_requests
parent80c25e8b9ab4ed3a8e38c40e0b257476df61ed75 (diff)
downloadgitlab-ce-01605bc78c57e3c6e1fbdb5d2397e1ebf78d7b2b.tar.gz
fix body scrollTop references
Diffstat (limited to 'spec/features/merge_requests')
-rw-r--r--spec/features/merge_requests/diff_notes_resolve_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb
index 7264b3b6517..a1a6792d677 100644
--- a/spec/features/merge_requests/diff_notes_resolve_spec.rb
+++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb
@@ -192,7 +192,7 @@ feature 'Diff notes resolve', :js do
page.find('.discussion-next-btn').click
end
- expect(page.evaluate_script("$('body').scrollTop()")).to be > 0
+ expect(page.evaluate_script("window.pageYOffset")).to be > 0
end
it 'hides jump to next button when all resolved' do
@@ -308,7 +308,7 @@ feature 'Diff notes resolve', :js do
page.find('.discussion-next-btn').click
end
- expect(page.evaluate_script("$('body').scrollTop()")).to be > 0
+ expect(page.evaluate_script("window.pageYOffset")).to be > 0
end
it 'updates updated text after resolving note' do