892 lines
28 KiB
JavaScript
892 lines
28 KiB
JavaScript
import { GlLoadingIcon, GlPagination } from '@gitlab/ui';
|
|
import { shallowMount } from '@vue/test-utils';
|
|
import MockAdapter from 'axios-mock-adapter';
|
|
import Vue, { nextTick } from 'vue';
|
|
import VueApollo from 'vue-apollo';
|
|
// eslint-disable-next-line no-restricted-imports
|
|
import Vuex from 'vuex';
|
|
import getMRCodequalityAndSecurityReports from '~/diffs/components/graphql/get_mr_codequality_and_security_reports.query.graphql';
|
|
import createMockApollo from 'helpers/mock_apollo_helper';
|
|
import setWindowLocation from 'helpers/set_window_location_helper';
|
|
import { TEST_HOST } from 'spec/test_constants';
|
|
|
|
import App from '~/diffs/components/app.vue';
|
|
import CommitWidget from '~/diffs/components/commit_widget.vue';
|
|
import CompareVersions from '~/diffs/components/compare_versions.vue';
|
|
import DiffFile from '~/diffs/components/diff_file.vue';
|
|
import NoChanges from '~/diffs/components/no_changes.vue';
|
|
import FindingsDrawer from '~/diffs/components/shared/findings_drawer.vue';
|
|
import DiffsFileTree from '~/diffs/components/diffs_file_tree.vue';
|
|
|
|
import CollapsedFilesWarning from '~/diffs/components/collapsed_files_warning.vue';
|
|
import HiddenFilesWarning from '~/diffs/components/hidden_files_warning.vue';
|
|
|
|
import eventHub from '~/diffs/event_hub';
|
|
import { EVT_DISCUSSIONS_ASSIGNED } from '~/diffs/constants';
|
|
|
|
import axios from '~/lib/utils/axios_utils';
|
|
import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
|
|
import { Mousetrap } from '~/lib/mousetrap';
|
|
import * as urlUtils from '~/lib/utils/url_utility';
|
|
import * as commonUtils from '~/lib/utils/common_utils';
|
|
import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
|
|
import { stubPerformanceWebAPI } from 'helpers/performance';
|
|
import { getDiffFileMock } from 'jest/diffs/mock_data/diff_file';
|
|
import waitForPromises from 'helpers/wait_for_promises';
|
|
import { diffMetadata } from 'jest/diffs/mock_data/diff_metadata';
|
|
import createDiffsStore from '../create_diffs_store';
|
|
import diffsMockData from '../mock_data/merge_request_diffs';
|
|
|
|
const mergeRequestDiff = { version_index: 1 };
|
|
const TEST_ENDPOINT = `${TEST_HOST}/diff/endpoint`;
|
|
const COMMIT_URL = `${TEST_HOST}/COMMIT/OLD`;
|
|
const UPDATED_COMMIT_URL = `${TEST_HOST}/COMMIT/NEW`;
|
|
const ENDPOINT_BATCH_URL = `${TEST_HOST}/diff/endpointBatch`;
|
|
const ENDPOINT_METADATA_URL = `${TEST_HOST}/diff/endpointMetadata`;
|
|
|
|
Vue.use(Vuex);
|
|
Vue.use(VueApollo);
|
|
|
|
function getCollapsedFilesWarning(wrapper) {
|
|
return wrapper.findComponent(CollapsedFilesWarning);
|
|
}
|
|
|
|
describe('diffs/components/app', () => {
|
|
const oldMrTabs = window.mrTabs;
|
|
let store;
|
|
let wrapper;
|
|
let mock;
|
|
let fakeApollo;
|
|
|
|
const codeQualityAndSastQueryHandlerSuccess = jest.fn().mockResolvedValue({});
|
|
|
|
function createComponent(props = {}, extendStore = () => {}, provisions = {}, baseConfig = {}) {
|
|
fakeApollo = createMockApollo([
|
|
[getMRCodequalityAndSecurityReports, codeQualityAndSastQueryHandlerSuccess],
|
|
]);
|
|
|
|
const provide = {
|
|
...provisions,
|
|
glFeatures: {
|
|
...provisions.glFeatures,
|
|
},
|
|
};
|
|
|
|
store = createDiffsStore();
|
|
store.state.diffs.isLoading = false;
|
|
store.state.diffs.isTreeLoaded = true;
|
|
|
|
extendStore(store);
|
|
|
|
store.dispatch('diffs/setBaseConfig', {
|
|
endpoint: TEST_ENDPOINT,
|
|
endpointMetadata: ENDPOINT_METADATA_URL,
|
|
endpointBatch: ENDPOINT_BATCH_URL,
|
|
endpointDiffForPath: TEST_ENDPOINT,
|
|
projectPath: 'namespace/project',
|
|
dismissEndpoint: '',
|
|
showSuggestPopover: true,
|
|
mrReviews: {},
|
|
...baseConfig,
|
|
});
|
|
|
|
wrapper = shallowMount(App, {
|
|
apolloProvider: fakeApollo,
|
|
propsData: {
|
|
endpointCoverage: `${TEST_HOST}/diff/endpointCoverage`,
|
|
endpointCodequality: '',
|
|
sastReportAvailable: false,
|
|
projectPath: 'namespace/project',
|
|
currentUser: {},
|
|
changesEmptyStateIllustration: '',
|
|
...props,
|
|
},
|
|
provide,
|
|
store,
|
|
});
|
|
}
|
|
|
|
beforeEach(() => {
|
|
stubPerformanceWebAPI();
|
|
// setup globals (needed for component to mount :/)
|
|
window.mrTabs = {
|
|
resetViewContainer: jest.fn(),
|
|
};
|
|
window.mrTabs.expandViewContainer = jest.fn();
|
|
mock = new MockAdapter(axios);
|
|
mock.onGet(TEST_ENDPOINT).reply(HTTP_STATUS_OK, {});
|
|
});
|
|
|
|
afterEach(() => {
|
|
// reset globals
|
|
window.mrTabs = oldMrTabs;
|
|
|
|
mock.restore();
|
|
});
|
|
|
|
describe('fetch diff methods', () => {
|
|
beforeEach(() => {
|
|
const fetchResolver = () => {
|
|
store.state.diffs.retrievingBatches = false;
|
|
store.state.notes.doneFetchingBatchDiscussions = true;
|
|
store.state.notes.discussions = [];
|
|
return Promise.resolve({ real_size: 100 });
|
|
};
|
|
jest.spyOn(window, 'requestIdleCallback').mockImplementation((fn) => fn());
|
|
createComponent();
|
|
jest.spyOn(wrapper.vm, 'fetchDiffFilesMeta').mockImplementation(fetchResolver);
|
|
jest.spyOn(wrapper.vm, 'fetchDiffFilesBatch').mockImplementation(fetchResolver);
|
|
jest.spyOn(wrapper.vm, 'fetchCoverageFiles').mockImplementation(fetchResolver);
|
|
jest.spyOn(wrapper.vm, 'setDiscussions').mockImplementation(() => {});
|
|
store.state.diffs.retrievingBatches = true;
|
|
store.state.diffs.diffFiles = [];
|
|
return nextTick();
|
|
});
|
|
|
|
it('calls batch methods if diffsBatchLoad is enabled, and not latest version', async () => {
|
|
expect(wrapper.vm.diffFilesLength).toEqual(0);
|
|
wrapper.vm.fetchData(false);
|
|
|
|
await nextTick();
|
|
|
|
expect(wrapper.vm.fetchDiffFilesMeta).toHaveBeenCalled();
|
|
expect(wrapper.vm.fetchDiffFilesBatch).toHaveBeenCalled();
|
|
expect(wrapper.vm.fetchCoverageFiles).toHaveBeenCalled();
|
|
expect(wrapper.vm.diffFilesLength).toBe(100);
|
|
});
|
|
|
|
it('calls batch methods if diffsBatchLoad is enabled, and latest version', async () => {
|
|
expect(wrapper.vm.diffFilesLength).toEqual(0);
|
|
wrapper.vm.fetchData(false);
|
|
|
|
await nextTick();
|
|
|
|
expect(wrapper.vm.fetchDiffFilesMeta).toHaveBeenCalled();
|
|
expect(wrapper.vm.fetchDiffFilesBatch).toHaveBeenCalled();
|
|
expect(wrapper.vm.fetchCoverageFiles).toHaveBeenCalled();
|
|
expect(wrapper.vm.diffFilesLength).toBe(100);
|
|
});
|
|
});
|
|
|
|
describe('fetch diff with no changes', () => {
|
|
beforeEach(() => {
|
|
const fetchResolver = () => {
|
|
store.state.diffs.retrievingBatches = false;
|
|
return Promise.resolve({ real_size: null });
|
|
};
|
|
|
|
createComponent();
|
|
jest.spyOn(wrapper.vm, 'fetchDiffFilesMeta').mockImplementation(fetchResolver);
|
|
|
|
return nextTick();
|
|
});
|
|
|
|
it('diff counter to be 0 after fetch', async () => {
|
|
expect(wrapper.vm.diffFilesLength).toEqual(0);
|
|
wrapper.vm.fetchData(false);
|
|
|
|
await nextTick();
|
|
|
|
expect(wrapper.vm.fetchDiffFilesMeta).toHaveBeenCalled();
|
|
expect(wrapper.vm.diffFilesLength).toEqual(0);
|
|
});
|
|
});
|
|
|
|
describe('codequality diff', () => {
|
|
it('does not fetch code quality data on FOSS', () => {
|
|
createComponent();
|
|
expect(codeQualityAndSastQueryHandlerSuccess).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('SAST diff', () => {
|
|
it('does not fetch Sast data on FOSS', () => {
|
|
createComponent();
|
|
expect(codeQualityAndSastQueryHandlerSuccess).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
it('displays loading icon on loading', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.isLoading = true;
|
|
});
|
|
|
|
expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
|
|
});
|
|
|
|
it('displays loading icon on batch loading', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.batchLoadingState = 'loading';
|
|
});
|
|
|
|
expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
|
|
});
|
|
|
|
it('displays diffs container when not loading', () => {
|
|
createComponent();
|
|
|
|
expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(false);
|
|
expect(wrapper.find('#diffs').exists()).toBe(true);
|
|
});
|
|
|
|
it('does not show commit info', () => {
|
|
createComponent();
|
|
|
|
expect(wrapper.find('.blob-commit-info').exists()).toBe(false);
|
|
});
|
|
|
|
describe('row highlighting', () => {
|
|
beforeEach(() => {
|
|
window.location.hash = 'ABC_123';
|
|
});
|
|
|
|
it('sets highlighted row if hash exists in location object', async () => {
|
|
createComponent({
|
|
shouldShow: true,
|
|
});
|
|
|
|
// Component uses $nextTick so we wait until that has finished
|
|
await nextTick();
|
|
|
|
expect(store.state.diffs.highlightedRow).toBe('ABC_123');
|
|
});
|
|
|
|
it('marks current diff file based on currently highlighted row', async () => {
|
|
createComponent({
|
|
shouldShow: true,
|
|
});
|
|
|
|
// Component uses $nextTick so we wait until that has finished
|
|
await nextTick();
|
|
expect(store.state.diffs.currentDiffFileId).toBe('ABC');
|
|
});
|
|
|
|
it('renders findings-drawer', () => {
|
|
createComponent();
|
|
expect(wrapper.findComponent(FindingsDrawer).exists()).toBe(true);
|
|
});
|
|
});
|
|
|
|
it('marks current diff file based on currently highlighted row', async () => {
|
|
window.location.hash = 'ABC_123';
|
|
|
|
createComponent({
|
|
shouldShow: true,
|
|
});
|
|
|
|
// Component uses nextTick so we wait until that has finished
|
|
await nextTick();
|
|
|
|
expect(store.state.diffs.currentDiffFileId).toBe('ABC');
|
|
});
|
|
|
|
describe('empty state', () => {
|
|
it('renders empty state when no diff files exist', () => {
|
|
createComponent();
|
|
|
|
expect(wrapper.findComponent(NoChanges).exists()).toBe(true);
|
|
});
|
|
|
|
it('does not render empty state when diff files exist', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.diffFiles = ['anything'];
|
|
state.diffs.treeEntries['1'] = { type: 'blob', id: 1 };
|
|
});
|
|
|
|
expect(wrapper.findComponent(NoChanges).exists()).toBe(false);
|
|
expect(wrapper.findComponent({ name: 'DynamicScroller' }).props('items')).toBe(
|
|
store.state.diffs.diffFiles,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe('keyboard shortcut navigation', () => {
|
|
let spies = [];
|
|
let moveSpy;
|
|
let jumpSpy;
|
|
|
|
function setup(componentProps) {
|
|
createComponent(componentProps, ({ state }) => {
|
|
state.diffs.commit = { id: 'SHA123' };
|
|
});
|
|
|
|
moveSpy = jest.spyOn(wrapper.vm, 'moveToNeighboringCommit').mockImplementation(() => {});
|
|
jumpSpy = jest.spyOn(wrapper.vm, 'jumpToFile').mockImplementation(() => {});
|
|
spies = [jumpSpy, moveSpy];
|
|
}
|
|
|
|
describe('visible app', () => {
|
|
it.each`
|
|
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',
|
|
async ({ key, spy, args }) => {
|
|
setup({ shouldShow: true });
|
|
|
|
await nextTick();
|
|
expect(spies[spy]).not.toHaveBeenCalled();
|
|
|
|
Mousetrap.trigger(key);
|
|
|
|
expect(spies[spy]).toHaveBeenCalledWith(...args);
|
|
},
|
|
);
|
|
|
|
it.each`
|
|
key | name | spy | allowed
|
|
${'d'} | ${'jumpToFile'} | ${0} | ${['[', ']', 'j', 'k']}
|
|
${'r'} | ${'moveToNeighboringCommit'} | ${1} | ${['x', 'c']}
|
|
`(
|
|
`does not call \`$name()\` when a key that is not one of \`$allowed\` is pressed`,
|
|
async ({ key, spy }) => {
|
|
setup({ shouldShow: true });
|
|
|
|
await nextTick();
|
|
Mousetrap.trigger(key);
|
|
|
|
expect(spies[spy]).not.toHaveBeenCalled();
|
|
},
|
|
);
|
|
});
|
|
|
|
describe('hidden app', () => {
|
|
beforeEach(async () => {
|
|
setup({ shouldShow: false });
|
|
|
|
await nextTick();
|
|
Mousetrap.reset();
|
|
});
|
|
|
|
it.each`
|
|
key | name | spy
|
|
${'['} | ${'jumpToFile'} | ${0}
|
|
${'k'} | ${'jumpToFile'} | ${0}
|
|
${']'} | ${'jumpToFile'} | ${0}
|
|
${'j'} | ${'jumpToFile'} | ${0}
|
|
${'x'} | ${'moveToNeighboringCommit'} | ${1}
|
|
${'c'} | ${'moveToNeighboringCommit'} | ${1}
|
|
`('stops calling `$name()` when the app is hidden', ({ key, spy }) => {
|
|
Mousetrap.trigger(key);
|
|
|
|
expect(spies[spy]).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('jumpToFile', () => {
|
|
let spy;
|
|
|
|
beforeEach(() => {
|
|
createComponent({}, () => {
|
|
store.state.diffs.treeEntries = [
|
|
{ type: 'blob', fileHash: '111', path: '111.js' },
|
|
{ type: 'blob', fileHash: '222', path: '222.js' },
|
|
{ type: 'blob', fileHash: '333', path: '333.js' },
|
|
];
|
|
});
|
|
spy = jest.spyOn(store, 'dispatch');
|
|
});
|
|
|
|
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([
|
|
'diffs/scrollToFile',
|
|
{ path: '222.js' },
|
|
]);
|
|
store.state.diffs.currentDiffFileId = '222';
|
|
wrapper.vm.jumpToFile(+1);
|
|
|
|
expect(spy.mock.calls[spy.mock.calls.length - 1]).toEqual([
|
|
'diffs/scrollToFile',
|
|
{ path: '333.js' },
|
|
]);
|
|
store.state.diffs.currentDiffFileId = '333';
|
|
wrapper.vm.jumpToFile(-1);
|
|
|
|
expect(spy.mock.calls[spy.mock.calls.length - 1]).toEqual([
|
|
'diffs/scrollToFile',
|
|
{ path: '222.js' },
|
|
]);
|
|
});
|
|
|
|
it('does not jump to previous file from the first one', async () => {
|
|
await nextTick();
|
|
store.state.diffs.currentDiffFileId = '333';
|
|
|
|
expect(wrapper.vm.currentDiffIndex).toBe(2);
|
|
|
|
wrapper.vm.jumpToFile(+1);
|
|
|
|
expect(wrapper.vm.currentDiffIndex).toBe(2);
|
|
expect(spy).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('does not jump to next file from the last one', async () => {
|
|
await nextTick();
|
|
expect(wrapper.vm.currentDiffIndex).toBe(0);
|
|
|
|
wrapper.vm.jumpToFile(-1);
|
|
|
|
expect(wrapper.vm.currentDiffIndex).toBe(0);
|
|
expect(spy).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('commit watcher', () => {
|
|
const spy = () => {
|
|
jest.spyOn(wrapper.vm, 'refetchDiffData').mockImplementation(() => {});
|
|
jest.spyOn(wrapper.vm, 'adjustView').mockImplementation(() => {});
|
|
};
|
|
|
|
beforeEach(() => {
|
|
setWindowLocation(COMMIT_URL);
|
|
document.title = 'My Title';
|
|
});
|
|
|
|
beforeEach(() => {
|
|
jest.spyOn(urlUtils, 'updateHistory');
|
|
});
|
|
|
|
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' };
|
|
});
|
|
spy();
|
|
|
|
store.state.diffs.commit = { id: 'NEW' };
|
|
|
|
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`
|
|
isLoading | oldSha | newSha
|
|
${true} | ${'OLD'} | ${'NEW'}
|
|
${false} | ${'NEW'} | ${'NEW'}
|
|
`(
|
|
'given `{ "isLoading": $isLoading, "oldSha": "$oldSha", "newSha": "$newSha" }`, nothing should happen',
|
|
async ({ isLoading, oldSha, newSha }) => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.isLoading = isLoading;
|
|
state.diffs.commit = { ...state.diffs.commit, id: oldSha };
|
|
});
|
|
spy();
|
|
|
|
store.state.diffs.commit = { id: newSha };
|
|
|
|
await nextTick();
|
|
expect(urlUtils.updateHistory).not.toHaveBeenCalled();
|
|
expect(wrapper.vm.refetchDiffData).not.toHaveBeenCalled();
|
|
expect(wrapper.vm.adjustView).not.toHaveBeenCalled();
|
|
},
|
|
);
|
|
});
|
|
|
|
describe('diffs', () => {
|
|
it('should render compare versions component', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.mergeRequestDiffs = diffsMockData;
|
|
state.diffs.targetBranchName = 'target-branch';
|
|
state.diffs.mergeRequestDiff = mergeRequestDiff;
|
|
});
|
|
|
|
expect(wrapper.findComponent(CompareVersions).exists()).toBe(true);
|
|
expect(wrapper.findComponent(CompareVersions).props()).toEqual(
|
|
expect.objectContaining({
|
|
diffFilesCountText: null,
|
|
}),
|
|
);
|
|
});
|
|
|
|
describe('warnings', () => {
|
|
describe('hidden files', () => {
|
|
it('should render hidden files warning if render overflow warning is present', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.renderOverflowWarning = true;
|
|
state.diffs.realSize = '5';
|
|
state.diffs.plainDiffPath = 'plain diff path';
|
|
state.diffs.emailPatchPath = 'email patch path';
|
|
state.diffs.size = 1;
|
|
});
|
|
|
|
expect(wrapper.findComponent(HiddenFilesWarning).exists()).toBe(true);
|
|
expect(wrapper.findComponent(HiddenFilesWarning).props()).toEqual(
|
|
expect.objectContaining({
|
|
total: '5',
|
|
plainDiffPath: 'plain diff path',
|
|
emailPatchPath: 'email patch path',
|
|
visible: 1,
|
|
}),
|
|
);
|
|
});
|
|
});
|
|
|
|
describe('collapsed files', () => {
|
|
it('should render the collapsed files warning if there are any automatically collapsed files', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.diffFiles = [{ viewer: { automaticallyCollapsed: true } }];
|
|
});
|
|
|
|
expect(getCollapsedFilesWarning(wrapper).exists()).toBe(true);
|
|
});
|
|
|
|
it('should not render the collapsed files warning if there are no automatically collapsed files', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.diffFiles = [
|
|
{ viewer: { automaticallyCollapsed: false, manuallyCollapsed: true } },
|
|
{ viewer: { automaticallyCollapsed: false, manuallyCollapsed: false } },
|
|
];
|
|
});
|
|
|
|
expect(getCollapsedFilesWarning(wrapper).exists()).toBe(false);
|
|
});
|
|
});
|
|
});
|
|
|
|
it('should display commit widget if store has a commit', () => {
|
|
createComponent({}, () => {
|
|
store.state.diffs.commit = {
|
|
author: 'John Doe',
|
|
};
|
|
});
|
|
|
|
expect(wrapper.findComponent(CommitWidget).exists()).toBe(true);
|
|
});
|
|
|
|
it('should display diff file if there are diff files', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.diffFiles = [{ file_hash: '111', file_path: '111.js' }];
|
|
state.diffs.treeEntries = {
|
|
111: { type: 'blob', fileHash: '111', path: '111.js' },
|
|
123: { type: 'blob', fileHash: '123', path: '123.js' },
|
|
312: { type: 'blob', fileHash: '312', path: '312.js' },
|
|
};
|
|
});
|
|
|
|
expect(wrapper.findComponent({ name: 'DynamicScroller' }).exists()).toBe(true);
|
|
expect(wrapper.findComponent({ name: 'DynamicScroller' }).props('items')).toBe(
|
|
store.state.diffs.diffFiles,
|
|
);
|
|
});
|
|
|
|
it('should always render diffs file tree', () => {
|
|
createComponent();
|
|
expect(wrapper.findComponent(DiffsFileTree).exists()).toBe(true);
|
|
});
|
|
|
|
it('should pass renderDiffFiles to file tree as true when files are present', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.treeEntries = { 111: { type: 'blob', fileHash: '111', path: '111.js' } };
|
|
});
|
|
expect(wrapper.findComponent(DiffsFileTree).props('renderDiffFiles')).toBe(true);
|
|
});
|
|
|
|
it('should pass renderDiffFiles to file tree as false without files', () => {
|
|
createComponent();
|
|
expect(wrapper.findComponent(DiffsFileTree).props('renderDiffFiles')).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('setTreeDisplay', () => {
|
|
afterEach(() => {
|
|
localStorage.removeItem('mr_tree_show');
|
|
});
|
|
|
|
it('calls setShowTreeList when only 1 file', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.treeEntries = { 123: { type: 'blob', fileHash: '123' } };
|
|
});
|
|
jest.spyOn(store, 'dispatch');
|
|
wrapper.vm.setTreeDisplay();
|
|
|
|
expect(store.dispatch).toHaveBeenCalledWith('diffs/setShowTreeList', {
|
|
showTreeList: false,
|
|
saving: false,
|
|
});
|
|
});
|
|
|
|
it('calls setShowTreeList with true when more than 1 file is in tree entries map', () => {
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.treeEntries = {
|
|
111: { type: 'blob', fileHash: '111', path: '111.js' },
|
|
123: { type: 'blob', fileHash: '123', path: '123.js' },
|
|
};
|
|
});
|
|
jest.spyOn(store, 'dispatch');
|
|
|
|
wrapper.vm.setTreeDisplay();
|
|
|
|
expect(store.dispatch).toHaveBeenCalledWith('diffs/setShowTreeList', {
|
|
showTreeList: true,
|
|
saving: false,
|
|
});
|
|
});
|
|
|
|
it.each`
|
|
showTreeList
|
|
${true}
|
|
${false}
|
|
`('calls setShowTreeList with localstorage $showTreeList', ({ showTreeList }) => {
|
|
localStorage.setItem('mr_tree_show', showTreeList);
|
|
|
|
createComponent({}, ({ state }) => {
|
|
state.diffs.treeEntries['123'] = { sha: '123' };
|
|
});
|
|
jest.spyOn(store, 'dispatch');
|
|
|
|
wrapper.vm.setTreeDisplay();
|
|
|
|
expect(store.dispatch).toHaveBeenCalledWith('diffs/setShowTreeList', {
|
|
showTreeList,
|
|
saving: false,
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('file-by-file', () => {
|
|
let hashSpy;
|
|
|
|
beforeEach(() => {
|
|
hashSpy = jest.spyOn(commonUtils, 'handleLocationHash');
|
|
});
|
|
|
|
it('renders a single diff', async () => {
|
|
createComponent(
|
|
undefined,
|
|
({ state }) => {
|
|
state.diffs.treeEntries = {
|
|
123: { type: 'blob', fileHash: '123' },
|
|
312: { type: 'blob', fileHash: '312' },
|
|
};
|
|
state.diffs.diffFiles.push({ file_hash: '312' });
|
|
},
|
|
undefined,
|
|
{ viewDiffsFileByFile: true },
|
|
);
|
|
|
|
await nextTick();
|
|
|
|
expect(wrapper.findAllComponents(DiffFile).length).toBe(1);
|
|
});
|
|
|
|
describe('rechecking the url hash for scrolling', () => {
|
|
const advanceAndCheckCalls = (count = 0) => {
|
|
jest.advanceTimersByTime(DEFAULT_DEBOUNCE_AND_THROTTLE_MS);
|
|
expect(hashSpy).toHaveBeenCalledTimes(count);
|
|
};
|
|
|
|
it('re-checks one time after the file finishes loading', () => {
|
|
createComponent(
|
|
undefined,
|
|
({ state }) => {
|
|
state.diffs.diffFiles = [{ isLoadingFullFile: true }];
|
|
},
|
|
undefined,
|
|
{ viewDiffsFileByFile: true },
|
|
);
|
|
|
|
// The hash check is not called if the file is still marked as loading
|
|
expect(hashSpy).toHaveBeenCalledTimes(0);
|
|
eventHub.$emit(EVT_DISCUSSIONS_ASSIGNED);
|
|
advanceAndCheckCalls();
|
|
eventHub.$emit(EVT_DISCUSSIONS_ASSIGNED);
|
|
advanceAndCheckCalls();
|
|
// Once the file has finished loading, it calls through to check the hash
|
|
store.state.diffs.diffFiles[0].isLoadingFullFile = false;
|
|
eventHub.$emit(EVT_DISCUSSIONS_ASSIGNED);
|
|
advanceAndCheckCalls(1);
|
|
// No further scrolls happen after one hash check / scroll
|
|
eventHub.$emit(EVT_DISCUSSIONS_ASSIGNED);
|
|
advanceAndCheckCalls(1);
|
|
eventHub.$emit(EVT_DISCUSSIONS_ASSIGNED);
|
|
advanceAndCheckCalls(1);
|
|
});
|
|
|
|
it('does not re-check when not in single-file mode', () => {
|
|
createComponent();
|
|
|
|
eventHub.$emit(EVT_DISCUSSIONS_ASSIGNED);
|
|
|
|
expect(hashSpy).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
|
|
describe('pagination', () => {
|
|
const fileByFileNav = () => wrapper.find('[data-testid="file-by-file-navigation"]');
|
|
const paginator = () => fileByFileNav().findComponent(GlPagination);
|
|
|
|
it('sets previous button as disabled', async () => {
|
|
createComponent(
|
|
undefined,
|
|
({ state }) => {
|
|
state.diffs.treeEntries = {
|
|
123: { type: 'blob', fileHash: '123' },
|
|
312: { type: 'blob', fileHash: '312' },
|
|
};
|
|
},
|
|
undefined,
|
|
{ viewDiffsFileByFile: true },
|
|
);
|
|
|
|
await nextTick();
|
|
|
|
expect(paginator().attributes('prevpage')).toBe(undefined);
|
|
expect(paginator().attributes('nextpage')).toBe('2');
|
|
});
|
|
|
|
it('sets next button as disabled', async () => {
|
|
createComponent(
|
|
undefined,
|
|
({ state }) => {
|
|
state.diffs.treeEntries = {
|
|
123: { type: 'blob', fileHash: '123' },
|
|
312: { type: 'blob', fileHash: '312' },
|
|
};
|
|
state.diffs.currentDiffFileId = '312';
|
|
},
|
|
undefined,
|
|
{ viewDiffsFileByFile: true },
|
|
);
|
|
|
|
await nextTick();
|
|
|
|
expect(paginator().attributes('prevpage')).toBe('1');
|
|
expect(paginator().attributes('nextpage')).toBe(undefined);
|
|
});
|
|
|
|
it("doesn't display when there's fewer than 2 files", async () => {
|
|
createComponent(
|
|
undefined,
|
|
({ state }) => {
|
|
state.diffs.treeEntries = { 123: { type: 'blob', fileHash: '123' } };
|
|
state.diffs.currentDiffFileId = '123';
|
|
},
|
|
undefined,
|
|
{ viewDiffsFileByFile: true },
|
|
);
|
|
|
|
await nextTick();
|
|
|
|
expect(fileByFileNav().exists()).toBe(false);
|
|
});
|
|
|
|
it.each`
|
|
currentDiffFileId | targetFile
|
|
${'123'} | ${2}
|
|
${'312'} | ${1}
|
|
`(
|
|
'calls navigateToDiffFileIndex with $index when $link is clicked',
|
|
async ({ currentDiffFileId, targetFile }) => {
|
|
createComponent(
|
|
undefined,
|
|
({ state }) => {
|
|
state.diffs.treeEntries = {
|
|
123: { type: 'blob', fileHash: '123', filePaths: { old: '1234', new: '123' } },
|
|
312: { type: 'blob', fileHash: '312', filePaths: { old: '3124', new: '312' } },
|
|
};
|
|
state.diffs.currentDiffFileId = currentDiffFileId;
|
|
},
|
|
undefined,
|
|
{ viewDiffsFileByFile: true },
|
|
);
|
|
|
|
await nextTick();
|
|
|
|
jest.spyOn(wrapper.vm, 'navigateToDiffFileIndex');
|
|
|
|
paginator().vm.$emit('input', targetFile);
|
|
|
|
await nextTick();
|
|
|
|
expect(wrapper.vm.navigateToDiffFileIndex).toHaveBeenCalledWith(targetFile - 1);
|
|
},
|
|
);
|
|
});
|
|
});
|
|
|
|
describe('autoscroll', () => {
|
|
let loadSpy;
|
|
|
|
beforeEach(() => {
|
|
createComponent();
|
|
|
|
store.state.diffs.diffFiles = [
|
|
{
|
|
file_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
|
|
highlighted_diff_lines: [],
|
|
viewer: { manuallyCollapsed: true },
|
|
},
|
|
];
|
|
|
|
loadSpy = jest.spyOn(wrapper.vm, 'loadCollapsedDiff').mockResolvedValue('resolved');
|
|
});
|
|
|
|
it('does nothing if the location hash does not include a file hash', () => {
|
|
window.location.hash = 'not_a_file_hash';
|
|
|
|
eventHub.$emit('doneLoadingBatches');
|
|
|
|
expect(loadSpy).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('requests that the correct file be loaded', () => {
|
|
window.location.hash = '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_0_1';
|
|
|
|
eventHub.$emit('doneLoadingBatches');
|
|
|
|
expect(loadSpy).toHaveBeenCalledWith({ file: store.state.diffs.diffFiles[0] });
|
|
});
|
|
|
|
it('does nothing when file is not collapsed', () => {
|
|
store.state.diffs.diffFiles[0].viewer.manuallyCollapsed = false;
|
|
window.location.hash = '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_0_1';
|
|
|
|
eventHub.$emit('doneLoadingBatches');
|
|
|
|
expect(loadSpy).not.toHaveBeenCalledWith({ file: store.state.diffs.diffFiles[0] });
|
|
});
|
|
});
|
|
|
|
describe('pinned file', () => {
|
|
const pinnedFileUrl = 'http://localhost.test/pinned-file';
|
|
let pinnedFile;
|
|
|
|
beforeEach(() => {
|
|
pinnedFile = getDiffFileMock();
|
|
mock.onGet(pinnedFileUrl).reply(HTTP_STATUS_OK, { diff_files: [pinnedFile] });
|
|
mock
|
|
.onGet(new RegExp(ENDPOINT_BATCH_URL))
|
|
.reply(HTTP_STATUS_OK, { diff_files: [], pagination: {} });
|
|
mock.onGet(new RegExp(ENDPOINT_METADATA_URL)).reply(HTTP_STATUS_OK, diffMetadata);
|
|
|
|
createComponent({ shouldShow: true, pinnedFileUrl });
|
|
});
|
|
|
|
it('fetches and displays pinned file', async () => {
|
|
await waitForPromises();
|
|
|
|
expect(wrapper.findComponent({ name: 'DynamicScroller' }).props('items')[0].file_hash).toBe(
|
|
pinnedFile.file_hash,
|
|
);
|
|
});
|
|
|
|
it('shows a spinner during loading', () => {
|
|
expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
|
|
});
|
|
});
|
|
});
|