diff options
Diffstat (limited to 'spec/frontend/diffs/components/app_spec.js')
-rw-r--r-- | spec/frontend/diffs/components/app_spec.js | 388 |
1 files changed, 155 insertions, 233 deletions
diff --git a/spec/frontend/diffs/components/app_spec.js b/spec/frontend/diffs/components/app_spec.js index 416564b72c3..7fbeb33dd93 100644 --- a/spec/frontend/diffs/components/app_spec.js +++ b/spec/frontend/diffs/components/app_spec.js @@ -1,5 +1,6 @@ +import Vue, { nextTick } from 'vue'; import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; +import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlPagination } from '@gitlab/ui'; import MockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'spec/test_constants'; @@ -26,6 +27,8 @@ const TEST_ENDPOINT = `${TEST_HOST}/diff/endpoint`; const COMMIT_URL = `${TEST_HOST}/COMMIT/OLD`; const UPDATED_COMMIT_URL = `${TEST_HOST}/COMMIT/NEW`; +Vue.use(Vuex); + function getCollapsedFilesWarning(wrapper) { return wrapper.find(CollapsedFilesWarning); } @@ -37,7 +40,6 @@ describe('diffs/components/app', () => { let mock; function createComponent(props = {}, extendStore = () => {}, provisions = {}) { - const localVue = createLocalVue(); const provide = { ...provisions, glFeatures: { @@ -45,16 +47,13 @@ describe('diffs/components/app', () => { }, }; - localVue.use(Vuex); - store = createDiffsStore(); store.state.diffs.isLoading = false; store.state.diffs.isTreeLoaded = true; extendStore(store); - wrapper = shallowMount(localVue.extend(App), { - localVue, + wrapper = shallowMount(App, { propsData: { endpoint: TEST_ENDPOINT, endpointMetadata: `${TEST_HOST}/diff/endpointMetadata`, @@ -70,11 +69,6 @@ describe('diffs/components/app', () => { }, provide, store, - methods: { - isLatestVersion() { - return true; - }, - }, }); } @@ -102,13 +96,13 @@ describe('diffs/components/app', () => { }); describe('fetch diff methods', () => { - beforeEach(done => { + beforeEach(() => { const fetchResolver = () => { store.state.diffs.retrievingBatches = false; store.state.notes.discussions = 'test'; return Promise.resolve({ real_size: 100 }); }; - jest.spyOn(window, 'requestIdleCallback').mockImplementation(fn => fn()); + jest.spyOn(window, 'requestIdleCallback').mockImplementation((fn) => fn()); createComponent(); jest.spyOn(wrapper.vm, 'fetchDiffFilesMeta').mockImplementation(fetchResolver); jest.spyOn(wrapper.vm, 'fetchDiffFilesBatch').mockImplementation(fetchResolver); @@ -119,68 +113,55 @@ describe('diffs/components/app', () => { jest.spyOn(wrapper.vm, 'unwatchRetrievingBatches').mockImplementation(() => {}); store.state.diffs.retrievingBatches = true; store.state.diffs.diffFiles = []; - wrapper.vm.$nextTick(done); + return nextTick(); }); - it('calls batch methods if diffsBatchLoad is enabled, and not latest version', done => { + it('calls batch methods if diffsBatchLoad is enabled, and not latest version', async () => { expect(wrapper.vm.diffFilesLength).toEqual(0); - wrapper.vm.isLatestVersion = () => false; wrapper.vm.fetchData(false); - setImmediate(() => { - expect(wrapper.vm.startRenderDiffsQueue).toHaveBeenCalled(); - expect(wrapper.vm.fetchDiffFilesMeta).toHaveBeenCalled(); - expect(wrapper.vm.fetchDiffFilesBatch).toHaveBeenCalled(); - expect(wrapper.vm.fetchCoverageFiles).toHaveBeenCalled(); - expect(wrapper.vm.unwatchDiscussions).toHaveBeenCalled(); - expect(wrapper.vm.diffFilesLength).toEqual(100); - expect(wrapper.vm.unwatchRetrievingBatches).toHaveBeenCalled(); - done(); - }); + await nextTick(); + + expect(wrapper.vm.startRenderDiffsQueue).toHaveBeenCalled(); + expect(wrapper.vm.fetchDiffFilesMeta).toHaveBeenCalled(); + expect(wrapper.vm.fetchDiffFilesBatch).toHaveBeenCalled(); + expect(wrapper.vm.fetchCoverageFiles).toHaveBeenCalled(); + expect(wrapper.vm.unwatchDiscussions).toHaveBeenCalled(); + expect(wrapper.vm.diffFilesLength).toBe(100); + expect(wrapper.vm.unwatchRetrievingBatches).toHaveBeenCalled(); }); - it('calls batch methods if diffsBatchLoad is enabled, and latest version', done => { + it('calls batch methods if diffsBatchLoad is enabled, and latest version', async () => { expect(wrapper.vm.diffFilesLength).toEqual(0); wrapper.vm.fetchData(false); - setImmediate(() => { - expect(wrapper.vm.startRenderDiffsQueue).toHaveBeenCalled(); - expect(wrapper.vm.fetchDiffFilesMeta).toHaveBeenCalled(); - expect(wrapper.vm.fetchDiffFilesBatch).toHaveBeenCalled(); - expect(wrapper.vm.fetchCoverageFiles).toHaveBeenCalled(); - expect(wrapper.vm.unwatchDiscussions).toHaveBeenCalled(); - expect(wrapper.vm.diffFilesLength).toEqual(100); - expect(wrapper.vm.unwatchRetrievingBatches).toHaveBeenCalled(); - done(); - }); - }); - }); - - it('adds container-limiting classes when showFileTree is false with inline diffs', () => { - createComponent({}, ({ state }) => { - state.diffs.showTreeList = false; - state.diffs.isParallelView = false; - }); - - expect(wrapper.find('.container-limited.limit-container-width').exists()).toBe(true); - }); + await nextTick(); - it('does not add container-limiting classes when showFileTree is false with inline diffs', () => { - createComponent({}, ({ state }) => { - state.diffs.showTreeList = true; - state.diffs.isParallelView = false; + expect(wrapper.vm.startRenderDiffsQueue).toHaveBeenCalled(); + expect(wrapper.vm.fetchDiffFilesMeta).toHaveBeenCalled(); + expect(wrapper.vm.fetchDiffFilesBatch).toHaveBeenCalled(); + expect(wrapper.vm.fetchCoverageFiles).toHaveBeenCalled(); + expect(wrapper.vm.unwatchDiscussions).toHaveBeenCalled(); + expect(wrapper.vm.diffFilesLength).toBe(100); + expect(wrapper.vm.unwatchRetrievingBatches).toHaveBeenCalled(); }); - - expect(wrapper.find('.container-limited.limit-container-width').exists()).toBe(false); }); - it('does not add container-limiting classes when isFluidLayout', () => { - createComponent({ isFluidLayout: true }, ({ state }) => { - state.diffs.isParallelView = false; - }); - - expect(wrapper.find('.container-limited.limit-container-width').exists()).toBe(false); - }); + it.each` + props | state | expected + ${{ isFluidLayout: true }} | ${{ isParallelView: false }} | ${false} + ${{}} | ${{ isParallelView: false }} | ${true} + ${{}} | ${{ showTreeList: true, diffFiles: [{}], isParallelView: false }} | ${false} + ${{}} | ${{ showTreeList: false, diffFiles: [{}], isParallelView: false }} | ${true} + ${{}} | ${{ showTreeList: false, diffFiles: [], isParallelView: false }} | ${true} + `( + 'uses container-limiting classes ($expected) with state ($state) and props ($props)', + ({ props, state, expected }) => { + createComponent(props, ({ state: origState }) => Object.assign(origState.diffs, state)); + + expect(wrapper.find('.container-limited.limit-container-width').exists()).toBe(expected); + }, + ); it('displays loading icon on loading', () => { createComponent({}, ({ state }) => { @@ -216,28 +197,25 @@ describe('diffs/components/app', () => { window.location.hash = 'ABC_123'; }); - it('sets highlighted row if hash exists in location object', done => { + it('sets highlighted row if hash exists in location object', async () => { createComponent({ shouldShow: true, }); // Component uses $nextTick so we wait until that has finished - setImmediate(() => { - expect(store.state.diffs.highlightedRow).toBe('ABC_123'); + await nextTick(); - done(); - }); + expect(store.state.diffs.highlightedRow).toBe('ABC_123'); }); - it('marks current diff file based on currently highlighted row', () => { + it('marks current diff file based on currently highlighted row', async () => { createComponent({ shouldShow: true, }); // Component uses $nextTick so we wait until that has finished - return wrapper.vm.$nextTick().then(() => { - expect(store.state.diffs.currentDiffFileId).toBe('ABC'); - }); + await nextTick(); + expect(store.state.diffs.currentDiffFileId).toBe('ABC'); }); }); @@ -261,23 +239,23 @@ describe('diffs/components/app', () => { }); it('sets width of tree list', () => { - createComponent(); + createComponent({}, ({ state }) => { + state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }]; + }); expect(wrapper.find('.js-diff-tree-list').element.style.width).toEqual('320px'); }); }); - it('marks current diff file based on currently highlighted row', done => { + it('marks current diff file based on currently highlighted row', async () => { createComponent({ shouldShow: true, }); - // Component uses $nextTick so we wait until that has finished - setImmediate(() => { - expect(store.state.diffs.currentDiffFileId).toBe('ABC'); + // Component uses nextTick so we wait until that has finished + await nextTick(); - done(); - }); + expect(store.state.diffs.currentDiffFileId).toBe('ABC'); }); describe('empty state', () => { @@ -297,79 +275,43 @@ describe('diffs/components/app', () => { expect(wrapper.find(NoChanges).exists()).toBe(false); expect(wrapper.findAll(DiffFile).length).toBe(1); }); - - it('does not render empty state when versions match', () => { - createComponent({}, ({ state }) => { - state.diffs.startVersion = mergeRequestDiff; - state.diffs.mergeRequestDiff = mergeRequestDiff; - }); - - expect(wrapper.find(NoChanges).exists()).toBe(false); - }); }); describe('keyboard shortcut navigation', () => { let spies = []; - let jumpSpy; let moveSpy; + let jumpSpy; - function setup(componentProps, featureFlags) { - createComponent( - componentProps, - ({ state }) => { - state.diffs.commit = { id: 'SHA123' }; - }, - { glFeatures: { mrCommitNeighborNav: true, ...featureFlags } }, - ); + function setup(componentProps) { + createComponent(componentProps, ({ state }) => { + state.diffs.commit = { id: 'SHA123' }; + }); moveSpy = jest.spyOn(wrapper.vm, 'moveToNeighboringCommit').mockImplementation(() => {}); - jumpSpy = jest.fn(); + jumpSpy = jest.spyOn(wrapper.vm, 'jumpToFile').mockImplementation(() => {}); spies = [jumpSpy, moveSpy]; - wrapper.setMethods({ - jumpToFile: jumpSpy, - }); } describe('visible app', () => { it.each` - key | name | spy | args | featureFlags - ${'['} | ${'jumpToFile'} | ${0} | ${[-1]} | ${{}} - ${'k'} | ${'jumpToFile'} | ${0} | ${[-1]} | ${{}} - ${']'} | ${'jumpToFile'} | ${0} | ${[+1]} | ${{}} - ${'j'} | ${'jumpToFile'} | ${0} | ${[+1]} | ${{}} - ${'x'} | ${'moveToNeighboringCommit'} | ${1} | ${[{ direction: 'previous' }]} | ${{ mrCommitNeighborNav: true }} - ${'c'} | ${'moveToNeighboringCommit'} | ${1} | ${[{ direction: 'next' }]} | ${{ mrCommitNeighborNav: true }} + key | name | spy | args + ${'['} | ${'jumpToFile'} | ${0} | ${[-1]} + ${'k'} | ${'jumpToFile'} | ${0} | ${[-1]} + ${']'} | ${'jumpToFile'} | ${0} | ${[+1]} + ${'j'} | ${'jumpToFile'} | ${0} | ${[+1]} + ${'x'} | ${'moveToNeighboringCommit'} | ${1} | ${[{ direction: 'previous' }]} + ${'c'} | ${'moveToNeighboringCommit'} | ${1} | ${[{ direction: 'next' }]} `( 'calls `$name()` with correct parameters whenever the "$key" key is pressed', - ({ key, spy, args, featureFlags }) => { - setup({ shouldShow: true }, featureFlags); - - return wrapper.vm.$nextTick().then(() => { - expect(spies[spy]).not.toHaveBeenCalled(); - - Mousetrap.trigger(key); - - expect(spies[spy]).toHaveBeenCalledWith(...args); - }); - }, - ); - - it.each` - key | name | spy | featureFlags - ${'x'} | ${'moveToNeighboringCommit'} | ${1} | ${{ mrCommitNeighborNav: false }} - ${'c'} | ${'moveToNeighboringCommit'} | ${1} | ${{ mrCommitNeighborNav: false }} - `( - 'does not call `$name()` even when the correct key is pressed if the feature flag is disabled', - ({ key, spy, featureFlags }) => { - setup({ shouldShow: true }, featureFlags); + async ({ key, spy, args }) => { + setup({ shouldShow: true }); - return wrapper.vm.$nextTick().then(() => { - expect(spies[spy]).not.toHaveBeenCalled(); + await nextTick(); + expect(spies[spy]).not.toHaveBeenCalled(); - Mousetrap.trigger(key); + Mousetrap.trigger(key); - expect(spies[spy]).not.toHaveBeenCalled(); - }); + expect(spies[spy]).toHaveBeenCalledWith(...args); }, ); @@ -379,25 +321,23 @@ describe('diffs/components/app', () => { ${'r'} | ${'moveToNeighboringCommit'} | ${1} | ${['x', 'c']} `( `does not call \`$name()\` when a key that is not one of \`$allowed\` is pressed`, - ({ key, spy }) => { - setup({ shouldShow: true }, { mrCommitNeighborNav: true }); + async ({ key, spy }) => { + setup({ shouldShow: true }); - return wrapper.vm.$nextTick().then(() => { - Mousetrap.trigger(key); + await nextTick(); + Mousetrap.trigger(key); - expect(spies[spy]).not.toHaveBeenCalled(); - }); + expect(spies[spy]).not.toHaveBeenCalled(); }, ); }); describe('hidden app', () => { - beforeEach(() => { - setup({ shouldShow: false }, { mrCommitNeighborNav: true }); + beforeEach(async () => { + setup({ shouldShow: false }); - return wrapper.vm.$nextTick().then(() => { - Mousetrap.reset(); - }); + await nextTick(); + Mousetrap.reset(); }); it.each` @@ -420,8 +360,6 @@ describe('diffs/components/app', () => { let spy; beforeEach(() => { - spy = jest.fn(); - createComponent({}, () => { store.state.diffs.diffFiles = [ { file_hash: '111', file_path: '111.js' }, @@ -429,66 +367,49 @@ describe('diffs/components/app', () => { { file_hash: '333', file_path: '333.js' }, ]; }); - - wrapper.setMethods({ - scrollToFile: spy, - }); + spy = jest.spyOn(store, 'dispatch'); }); afterEach(() => { wrapper.destroy(); }); - it('jumps to next and previous files in the list', done => { - wrapper.vm - .$nextTick() - .then(() => { - wrapper.vm.jumpToFile(+1); + it('jumps to next and previous files in the list', async () => { + await nextTick(); + + wrapper.vm.jumpToFile(+1); - expect(spy.mock.calls[spy.mock.calls.length - 1]).toEqual(['222.js']); - store.state.diffs.currentDiffFileId = '222'; - wrapper.vm.jumpToFile(+1); + expect(spy.mock.calls[spy.mock.calls.length - 1]).toEqual(['diffs/scrollToFile', '222.js']); + store.state.diffs.currentDiffFileId = '222'; + wrapper.vm.jumpToFile(+1); - expect(spy.mock.calls[spy.mock.calls.length - 1]).toEqual(['333.js']); - store.state.diffs.currentDiffFileId = '333'; - wrapper.vm.jumpToFile(-1); + expect(spy.mock.calls[spy.mock.calls.length - 1]).toEqual(['diffs/scrollToFile', '333.js']); + store.state.diffs.currentDiffFileId = '333'; + wrapper.vm.jumpToFile(-1); - expect(spy.mock.calls[spy.mock.calls.length - 1]).toEqual(['222.js']); - }) - .then(done) - .catch(done.fail); + expect(spy.mock.calls[spy.mock.calls.length - 1]).toEqual(['diffs/scrollToFile', '222.js']); }); - it('does not jump to previous file from the first one', done => { - wrapper.vm - .$nextTick() - .then(() => { - store.state.diffs.currentDiffFileId = '333'; + it('does not jump to previous file from the first one', async () => { + await nextTick(); + store.state.diffs.currentDiffFileId = '333'; - expect(wrapper.vm.currentDiffIndex).toEqual(2); + expect(wrapper.vm.currentDiffIndex).toBe(2); - wrapper.vm.jumpToFile(+1); + wrapper.vm.jumpToFile(+1); - expect(wrapper.vm.currentDiffIndex).toEqual(2); - expect(spy).not.toHaveBeenCalled(); - }) - .then(done) - .catch(done.fail); + expect(wrapper.vm.currentDiffIndex).toBe(2); + expect(spy).not.toHaveBeenCalled(); }); - it('does not jump to next file from the last one', done => { - wrapper.vm - .$nextTick() - .then(() => { - expect(wrapper.vm.currentDiffIndex).toEqual(0); + it('does not jump to next file from the last one', async () => { + await nextTick(); + expect(wrapper.vm.currentDiffIndex).toBe(0); - wrapper.vm.jumpToFile(-1); + wrapper.vm.jumpToFile(-1); - expect(wrapper.vm.currentDiffIndex).toEqual(0); - expect(spy).not.toHaveBeenCalled(); - }) - .then(done) - .catch(done.fail); + expect(wrapper.vm.currentDiffIndex).toBe(0); + expect(spy).not.toHaveBeenCalled(); }); }); @@ -514,7 +435,7 @@ describe('diffs/components/app', () => { window.location = location; }); - it('when the commit changes and the app is not loading it should update the history, refetch the diff data, and update the view', () => { + it('when the commit changes and the app is not loading it should update the history, refetch the diff data, and update the view', async () => { createComponent({}, ({ state }) => { state.diffs.commit = { ...state.diffs.commit, id: 'OLD' }; }); @@ -522,14 +443,13 @@ describe('diffs/components/app', () => { store.state.diffs.commit = { id: 'NEW' }; - return wrapper.vm.$nextTick().then(() => { - expect(urlUtils.updateHistory).toHaveBeenCalledWith({ - title: document.title, - url: UPDATED_COMMIT_URL, - }); - expect(wrapper.vm.refetchDiffData).toHaveBeenCalled(); - expect(wrapper.vm.adjustView).toHaveBeenCalled(); + await nextTick(); + expect(urlUtils.updateHistory).toHaveBeenCalledWith({ + title: document.title, + url: UPDATED_COMMIT_URL, }); + expect(wrapper.vm.refetchDiffData).toHaveBeenCalled(); + expect(wrapper.vm.adjustView).toHaveBeenCalled(); }); it.each` @@ -538,7 +458,7 @@ describe('diffs/components/app', () => { ${false} | ${'NEW'} | ${'NEW'} `( 'given `{ "isLoading": $isLoading, "oldSha": "$oldSha", "newSha": "$newSha" }`, nothing should happen', - ({ isLoading, oldSha, newSha }) => { + async ({ isLoading, oldSha, newSha }) => { createComponent({}, ({ state }) => { state.diffs.isLoading = isLoading; state.diffs.commit = { ...state.diffs.commit, id: oldSha }; @@ -547,11 +467,10 @@ describe('diffs/components/app', () => { store.state.diffs.commit = { id: newSha }; - return wrapper.vm.$nextTick().then(() => { - expect(urlUtils.updateHistory).not.toHaveBeenCalled(); - expect(wrapper.vm.refetchDiffData).not.toHaveBeenCalled(); - expect(wrapper.vm.adjustView).not.toHaveBeenCalled(); - }); + await nextTick(); + expect(urlUtils.updateHistory).not.toHaveBeenCalled(); + expect(wrapper.vm.refetchDiffData).not.toHaveBeenCalled(); + expect(wrapper.vm.adjustView).not.toHaveBeenCalled(); }, ); }); @@ -559,6 +478,7 @@ describe('diffs/components/app', () => { describe('diffs', () => { it('should render compare versions component', () => { createComponent({}, ({ state }) => { + state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }]; state.diffs.mergeRequestDiffs = diffsMockData; state.diffs.targetBranchName = 'target-branch'; state.diffs.mergeRequestDiff = mergeRequestDiff; @@ -567,7 +487,8 @@ describe('diffs/components/app', () => { expect(wrapper.find(CompareVersions).exists()).toBe(true); expect(wrapper.find(CompareVersions).props()).toEqual( expect.objectContaining({ - mergeRequestDiffs: diffsMockData, + isLimitedContainer: false, + diffFilesCountText: null, }), ); }); @@ -635,20 +556,22 @@ describe('diffs/components/app', () => { expect(wrapper.find(DiffFile).exists()).toBe(true); }); - it('should render tree list', () => { + it("doesn't render tree list when no changes exist", () => { createComponent(); - expect(wrapper.find(TreeList).exists()).toBe(true); + expect(wrapper.find(TreeList).exists()).toBe(false); }); - }); - describe('setTreeDisplay', () => { - let setShowTreeList; + it('should render tree list', () => { + createComponent({}, ({ state }) => { + state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }]; + }); - beforeEach(() => { - setShowTreeList = jest.fn(); + expect(wrapper.find(TreeList).exists()).toBe(true); }); + }); + describe('setTreeDisplay', () => { afterEach(() => { localStorage.removeItem('mr_tree_show'); }); @@ -657,14 +580,13 @@ describe('diffs/components/app', () => { createComponent({}, ({ state }) => { state.diffs.diffFiles.push({ sha: '123' }); }); - - wrapper.setMethods({ - setShowTreeList, - }); - + jest.spyOn(store, 'dispatch'); wrapper.vm.setTreeDisplay(); - expect(setShowTreeList).toHaveBeenCalledWith({ showTreeList: false, saving: false }); + expect(store.dispatch).toHaveBeenCalledWith('diffs/setShowTreeList', { + showTreeList: false, + saving: false, + }); }); it('calls setShowTreeList with true when more than 1 file is in diffs array', () => { @@ -672,14 +594,14 @@ describe('diffs/components/app', () => { state.diffs.diffFiles.push({ sha: '123' }); state.diffs.diffFiles.push({ sha: '124' }); }); - - wrapper.setMethods({ - setShowTreeList, - }); + jest.spyOn(store, 'dispatch'); wrapper.vm.setTreeDisplay(); - expect(setShowTreeList).toHaveBeenCalledWith({ showTreeList: true, saving: false }); + expect(store.dispatch).toHaveBeenCalledWith('diffs/setShowTreeList', { + showTreeList: true, + saving: false, + }); }); it.each` @@ -692,14 +614,14 @@ describe('diffs/components/app', () => { createComponent({}, ({ state }) => { state.diffs.diffFiles.push({ sha: '123' }); }); - - wrapper.setMethods({ - setShowTreeList, - }); + jest.spyOn(store, 'dispatch'); wrapper.vm.setTreeDisplay(); - expect(setShowTreeList).toHaveBeenCalledWith({ showTreeList, saving: false }); + expect(store.dispatch).toHaveBeenCalledWith('diffs/setShowTreeList', { + showTreeList, + saving: false, + }); }); }); @@ -710,7 +632,7 @@ describe('diffs/components/app', () => { state.diffs.diffFiles.push({ file_hash: '312' }); }); - await wrapper.vm.$nextTick(); + await nextTick(); expect(wrapper.findAll(DiffFile).length).toBe(1); }); @@ -724,7 +646,7 @@ describe('diffs/components/app', () => { state.diffs.diffFiles.push({ file_hash: '123' }, { file_hash: '312' }); }); - await wrapper.vm.$nextTick(); + await nextTick(); expect(paginator().attributes('prevpage')).toBe(undefined); expect(paginator().attributes('nextpage')).toBe('2'); @@ -736,7 +658,7 @@ describe('diffs/components/app', () => { state.diffs.currentDiffFileId = '312'; }); - await wrapper.vm.$nextTick(); + await nextTick(); expect(paginator().attributes('prevpage')).toBe('1'); expect(paginator().attributes('nextpage')).toBe(undefined); @@ -748,7 +670,7 @@ describe('diffs/components/app', () => { state.diffs.currentDiffFileId = '123'; }); - await wrapper.vm.$nextTick(); + await nextTick(); expect(fileByFileNav().exists()).toBe(false); }); @@ -765,13 +687,13 @@ describe('diffs/components/app', () => { state.diffs.currentDiffFileId = currentDiffFileId; }); - await wrapper.vm.$nextTick(); + await nextTick(); jest.spyOn(wrapper.vm, 'navigateToDiffFileIndex'); paginator().vm.$emit('input', targetFile); - await wrapper.vm.$nextTick(); + await nextTick(); expect(wrapper.vm.navigateToDiffFileIndex).toHaveBeenCalledWith(targetFile - 1); }, @@ -787,10 +709,10 @@ describe('diffs/components/app', () => { 'triggers the action with the new fileByFile setting - $setting - when the event with that setting is received', async ({ setting }) => { createComponent(); - await wrapper.vm.$nextTick(); + await nextTick(); eventHub.$emit(EVT_VIEW_FILE_BY_FILE, { setting }); - await wrapper.vm.$nextTick(); + await nextTick(); expect(store.state.diffs.viewDiffsFileByFile).toBe(setting); }, |