diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-12 19:29:54 +0300 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-12 19:29:54 +0300 |
commit | b01fd7ad81524b5f2773ccba4b5789a6074ffb9d (patch) | |
tree | 3fd1a32596b0b1127e07686e8878be692ee0be9e /spec/features/merge_request | |
parent | 1e54e30ffc017efa350e2f372513aa55b5a0bd0c (diff) |
Fixes unresolved discussions rendering the error state instead of the diff
Diffstat (limited to 'spec/features/merge_request')
-rw-r--r-- | spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb b/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb index 565e375600b..be888bf1a55 100644 --- a/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb +++ b/spec/features/merge_request/user_scrolls_to_note_on_load_spec.rb @@ -27,6 +27,24 @@ describe 'Merge request > User scrolls to note on load', :js do expect(fragment_position_top).to be < (page_scroll_y + page_height) end + it 'renders un-collapsed notes with diff' do + page.current_window.resize_to(1000, 1000) + + visit "#{project_merge_request_path(project, merge_request)}#{fragment_id}" + + page.execute_script "window.scrollTo(0,0)" + + note_element = find(fragment_id) + note_container = note_element.ancestor('.js-toggle-container') + + expect(note_element.visible?).to eq true + + page.within note_container do + expect(page).not_to have_selector('.js-error-load-lazy-diff') + end + + end + it 'expands collapsed notes' do visit "#{project_merge_request_path(project, merge_request)}#{collapsed_fragment_id}" note_element = find(collapsed_fragment_id) |