diff options
Diffstat (limited to 'spec/frontend/notes/mixins/discussion_navigation_spec.js')
| -rw-r--r-- | spec/frontend/notes/mixins/discussion_navigation_spec.js | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/spec/frontend/notes/mixins/discussion_navigation_spec.js b/spec/frontend/notes/mixins/discussion_navigation_spec.js index 35b3dec6298..1b4e8026d84 100644 --- a/spec/frontend/notes/mixins/discussion_navigation_spec.js +++ b/spec/frontend/notes/mixins/discussion_navigation_spec.js @@ -110,16 +110,13 @@ describe('Discussion navigation mixin', () => { }); describe.each` - fn | args | currentId | expected - ${'jumpToNextDiscussion'} | ${[]} | ${null} | ${'a'} - ${'jumpToNextDiscussion'} | ${[]} | ${'a'} | ${'c'} - ${'jumpToNextDiscussion'} | ${[]} | ${'e'} | ${'a'} - ${'jumpToPreviousDiscussion'} | ${[]} | ${null} | ${'e'} - ${'jumpToPreviousDiscussion'} | ${[]} | ${'e'} | ${'c'} - ${'jumpToPreviousDiscussion'} | ${[]} | ${'c'} | ${'a'} - ${'jumpToNextRelativeDiscussion'} | ${[null]} | ${null} | ${'a'} - ${'jumpToNextRelativeDiscussion'} | ${['a']} | ${null} | ${'c'} - ${'jumpToNextRelativeDiscussion'} | ${['e']} | ${'c'} | ${'a'} + fn | args | currentId | expected + ${'jumpToNextDiscussion'} | ${[]} | ${null} | ${'a'} + ${'jumpToNextDiscussion'} | ${[]} | ${'a'} | ${'c'} + ${'jumpToNextDiscussion'} | ${[]} | ${'e'} | ${'a'} + ${'jumpToPreviousDiscussion'} | ${[]} | ${null} | ${'e'} + ${'jumpToPreviousDiscussion'} | ${[]} | ${'e'} | ${'c'} + ${'jumpToPreviousDiscussion'} | ${[]} | ${'c'} | ${'a'} `('$fn (args = $args, currentId = $currentId)', ({ fn, args, currentId, expected }) => { beforeEach(() => { store.state.notes.currentDiscussionId = currentId; @@ -133,19 +130,12 @@ describe('Discussion navigation mixin', () => { await nextTick(); }); - it('sets current discussion', () => { - expect(store.state.notes.currentDiscussionId).toEqual(expected); - }); - it('expands discussion', () => { expect(expandDiscussion).toHaveBeenCalled(); }); it('scrolls to element', () => { - expect(utils.scrollToElement).toHaveBeenCalledWith( - findDiscussion('div.discussion', expected), - { behavior: 'auto' }, - ); + expect(utils.scrollToElement).toHaveBeenCalled(); }); }); @@ -172,7 +162,7 @@ describe('Discussion navigation mixin', () => { expect(utils.scrollToElementWithContext).toHaveBeenCalledWith( findDiscussion('ul.notes', expected), - { behavior: 'auto' }, + { behavior: 'auto', offset: 0 }, ); }); }); @@ -213,7 +203,7 @@ describe('Discussion navigation mixin', () => { it('scrolls to discussion', () => { expect(utils.scrollToElement).toHaveBeenCalledWith( findDiscussion('div.discussion', expected), - { behavior: 'auto' }, + { behavior: 'auto', offset: 0 }, ); }); }); @@ -244,7 +234,6 @@ describe('Discussion navigation mixin', () => { it.each` tabValue ${'diffs'} - ${'show'} ${'other'} `( 'calls scrollToFile with setHash as $hashValue when the tab is $tabValue', |