diff options
author | Fatih Acet <acetfatih@gmail.com> | 2017-02-02 13:36:32 +0000 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-02-02 14:43:29 +0100 |
commit | 773a066cbbed52ba3ef7d7d91b840d55a76148bd (patch) | |
tree | 807dd7578021227bd3eb2fbd569ae19aeae29ded | |
parent | 7b02d450353526901266f5fe7f9bd5deddb6a5a3 (diff) | |
download | gitlab-ce-773a066cbbed52ba3ef7d7d91b840d55a76148bd.tar.gz |
Merge branch 'fix-broken-buil-9724713' into 'master'
Fixes broken build: Use jquery to get the element position in the page
See merge request !8926
-rw-r--r-- | spec/features/merge_requests/toggler_behavior_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/features/merge_requests/toggler_behavior_spec.rb b/spec/features/merge_requests/toggler_behavior_spec.rb index 6958f6a2c9f..44a9b545ff8 100644 --- a/spec/features/merge_requests/toggler_behavior_spec.rb +++ b/spec/features/merge_requests/toggler_behavior_spec.rb @@ -18,11 +18,10 @@ feature 'toggler_behavior', js: true, feature: true do it 'should be scrolled down to fragment' do page_height = page.current_window.size[1] page_scroll_y = page.evaluate_script("window.scrollY") - fragment_position_top = page.evaluate_script("document.querySelector('#{fragment_id}').getBoundingClientRect().top") - + fragment_position_top = page.evaluate_script("$('#{fragment_id}').offset().top") expect(find('.js-toggle-content').visible?).to eq true expect(find(fragment_id).visible?).to eq true - expect(fragment_position_top).to be > page_scroll_y + expect(fragment_position_top).to be >= page_scroll_y expect(fragment_position_top).to be < (page_scroll_y + page_height) end end |