summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-02-03 17:02:05 +0000
committerAlfredo Sumaran <alfredo@gitlab.com>2017-02-03 16:36:32 -0500
commitb63d7d4f8965597fd0a7291830ad391d1c74334e (patch)
treea1c678628b4b6556e18b139c3ec844b15f3a6d0e
parent9c60e8fb5963c55e1ea6cf28e3851d822f0bb540 (diff)
downloadgitlab-ce-fix-scroll-test.tar.gz
Change window size before visiting page, to get correct scroll positionfix-scroll-test
-rw-r--r--changelogs/unreleased/fix-scroll-test.yml4
-rw-r--r--spec/features/merge_requests/toggler_behavior_spec.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-scroll-test.yml b/changelogs/unreleased/fix-scroll-test.yml
new file mode 100644
index 00000000000..e98ac755b88
--- /dev/null
+++ b/changelogs/unreleased/fix-scroll-test.yml
@@ -0,0 +1,4 @@
+---
+title: Change rspec test to guarantee window is resized before visiting page
+merge_request:
+author:
diff --git a/spec/features/merge_requests/toggler_behavior_spec.rb b/spec/features/merge_requests/toggler_behavior_spec.rb
index 44a9b545ff8..a2cf9b18bf2 100644
--- a/spec/features/merge_requests/toggler_behavior_spec.rb
+++ b/spec/features/merge_requests/toggler_behavior_spec.rb
@@ -10,8 +10,8 @@ feature 'toggler_behavior', js: true, feature: true do
before do
login_as :admin
project = merge_request.source_project
- visit "#{namespace_project_merge_request_path(project.namespace, project, merge_request)}#{fragment_id}"
page.current_window.resize_to(1000, 300)
+ visit "#{namespace_project_merge_request_path(project.namespace, project, merge_request)}#{fragment_id}"
end
describe 'scroll position' do