diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-03 22:55:17 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-02-03 22:55:17 +0000 |
| commit | 575aea54e4ab83c93cd69413479372815cd287c5 (patch) | |
| tree | 729a4a6e5a669ca9e4a8a5a67bb5b15d5840a6f0 | |
| parent | 496646d4a2c79144c514c385b9a14174586287f4 (diff) | |
| parent | b63d7d4f8965597fd0a7291830ad391d1c74334e (diff) | |
| download | gitlab-ce-575aea54e4ab83c93cd69413479372815cd287c5.tar.gz | |
Merge branch 'fix-scroll-test' into 'master'
Change window size before visiting page, to get correct scroll position
See merge request !8963
| -rw-r--r-- | changelogs/unreleased/fix-scroll-test.yml | 4 | ||||
| -rw-r--r-- | spec/features/merge_requests/toggler_behavior_spec.rb | 2 |
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 |