2018-11-08 19:23:39 +05:30
|
|
|
import MockAdapter from 'axios-mock-adapter';
|
|
|
|
import Cookies from 'js-cookie';
|
2020-10-24 23:57:45 +05:30
|
|
|
import { useLocalStorageSpy } from 'helpers/local_storage_helper';
|
2021-03-08 18:12:59 +05:30
|
|
|
import { TEST_HOST } from 'helpers/test_constants';
|
|
|
|
import testAction from 'helpers/vuex_action_helper';
|
2021-03-11 19:13:27 +05:30
|
|
|
import mockDiffFile from 'jest/diffs/mock_data/diff_file';
|
2018-11-08 19:23:39 +05:30
|
|
|
import {
|
|
|
|
DIFF_VIEW_COOKIE_NAME,
|
|
|
|
INLINE_DIFF_VIEW_TYPE,
|
|
|
|
PARALLEL_DIFF_VIEW_TYPE,
|
|
|
|
} from '~/diffs/constants';
|
2020-04-22 19:07:51 +05:30
|
|
|
import {
|
2018-11-20 20:47:30 +05:30
|
|
|
setBaseConfig,
|
2020-01-01 13:55:28 +05:30
|
|
|
fetchDiffFilesBatch,
|
|
|
|
fetchDiffFilesMeta,
|
2020-04-08 14:13:33 +05:30
|
|
|
fetchCoverageFiles,
|
2018-11-20 20:47:30 +05:30
|
|
|
assignDiscussionsToDiff,
|
|
|
|
removeDiscussionsFromDiff,
|
|
|
|
startRenderDiffsQueue,
|
|
|
|
setInlineDiffViewType,
|
|
|
|
setParallelDiffViewType,
|
|
|
|
showCommentForm,
|
|
|
|
cancelCommentForm,
|
|
|
|
loadMoreLines,
|
|
|
|
scrollToLineIfNeededInline,
|
|
|
|
scrollToLineIfNeededParallel,
|
|
|
|
loadCollapsedDiff,
|
|
|
|
toggleFileDiscussions,
|
2018-12-05 23:21:45 +05:30
|
|
|
saveDiffDiscussion,
|
2019-02-15 15:39:39 +05:30
|
|
|
setHighlightedRow,
|
2018-12-05 23:21:45 +05:30
|
|
|
toggleTreeOpen,
|
|
|
|
scrollToFile,
|
2021-02-22 17:27:13 +05:30
|
|
|
setShowTreeList,
|
2019-02-15 15:39:39 +05:30
|
|
|
renderFileForDiscussionId,
|
2019-03-02 22:35:43 +05:30
|
|
|
setRenderTreeList,
|
|
|
|
setShowWhitespace,
|
2019-07-07 11:18:12 +05:30
|
|
|
setRenderIt,
|
|
|
|
receiveFullDiffError,
|
|
|
|
fetchFullDiff,
|
|
|
|
toggleFullDiff,
|
2020-05-24 23:13:21 +05:30
|
|
|
switchToFullDiffFromRenamedFile,
|
2021-01-29 00:20:46 +05:30
|
|
|
setFileCollapsedByUser,
|
2019-07-31 22:56:46 +05:30
|
|
|
setExpandedDiffLines,
|
2019-09-04 21:01:54 +05:30
|
|
|
setSuggestPopoverDismissed,
|
2020-05-24 23:13:21 +05:30
|
|
|
changeCurrentCommit,
|
|
|
|
moveToNeighboringCommit,
|
2020-07-28 23:09:34 +05:30
|
|
|
setCurrentDiffFileIdFromNote,
|
|
|
|
navigateToDiffFileIndex,
|
2021-02-22 17:27:13 +05:30
|
|
|
setFileByFile,
|
2021-03-08 18:12:59 +05:30
|
|
|
reviewFile,
|
2018-11-20 20:47:30 +05:30
|
|
|
} from '~/diffs/store/actions';
|
2018-11-08 19:23:39 +05:30
|
|
|
import * as types from '~/diffs/store/mutation_types';
|
2020-04-22 19:07:51 +05:30
|
|
|
import * as utils from '~/diffs/store/utils';
|
2021-09-04 01:27:46 +05:30
|
|
|
import * as workerUtils from '~/diffs/utils/workers';
|
|
|
|
import createFlash from '~/flash';
|
2021-03-11 19:13:27 +05:30
|
|
|
import axios from '~/lib/utils/axios_utils';
|
2020-04-22 19:07:51 +05:30
|
|
|
import * as commonUtils from '~/lib/utils/common_utils';
|
2020-06-23 00:09:42 +05:30
|
|
|
import { mergeUrlParams } from '~/lib/utils/url_utility';
|
2021-03-11 19:13:27 +05:30
|
|
|
import eventHub from '~/notes/event_hub';
|
2020-06-23 00:09:42 +05:30
|
|
|
import { diffMetadata } from '../mock_data/diff_metadata';
|
2020-04-22 19:07:51 +05:30
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
jest.mock('~/flash');
|
2018-11-08 19:23:39 +05:30
|
|
|
|
|
|
|
describe('DiffsStoreActions', () => {
|
2020-04-22 19:07:51 +05:30
|
|
|
useLocalStorageSpy();
|
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
const originalMethods = {
|
|
|
|
requestAnimationFrame: global.requestAnimationFrame,
|
|
|
|
requestIdleCallback: global.requestIdleCallback,
|
|
|
|
};
|
|
|
|
|
|
|
|
beforeEach(() => {
|
2020-04-22 19:07:51 +05:30
|
|
|
jest.spyOn(window.history, 'pushState');
|
|
|
|
jest.spyOn(commonUtils, 'historyPushState');
|
|
|
|
jest.spyOn(commonUtils, 'handleLocationHash').mockImplementation(() => null);
|
|
|
|
jest.spyOn(commonUtils, 'scrollToElement').mockImplementation(() => null);
|
|
|
|
jest.spyOn(utils, 'convertExpandLines').mockImplementation(() => null);
|
|
|
|
jest.spyOn(utils, 'idleCallback').mockImplementation(() => null);
|
2021-03-08 18:12:59 +05:30
|
|
|
['requestAnimationFrame', 'requestIdleCallback'].forEach((method) => {
|
|
|
|
global[method] = (cb) => {
|
2021-04-29 21:17:54 +05:30
|
|
|
cb({ timeRemaining: () => 10 });
|
2018-11-20 20:47:30 +05:30
|
|
|
};
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
afterEach(() => {
|
2021-03-08 18:12:59 +05:30
|
|
|
['requestAnimationFrame', 'requestIdleCallback'].forEach((method) => {
|
2018-11-20 20:47:30 +05:30
|
|
|
global[method] = originalMethods[method];
|
|
|
|
});
|
2020-04-22 19:07:51 +05:30
|
|
|
createFlash.mockClear();
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
describe('setBaseConfig', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should set given endpoint and project path', (done) => {
|
2018-11-08 19:23:39 +05:30
|
|
|
const endpoint = '/diffs/set/endpoint';
|
2020-01-01 13:55:28 +05:30
|
|
|
const endpointMetadata = '/diffs/set/endpoint/metadata';
|
|
|
|
const endpointBatch = '/diffs/set/endpoint/batch';
|
2020-04-08 14:13:33 +05:30
|
|
|
const endpointCoverage = '/diffs/set/coverage_reports';
|
2018-11-08 19:23:39 +05:30
|
|
|
const projectPath = '/root/project';
|
2019-09-04 21:01:54 +05:30
|
|
|
const dismissEndpoint = '/-/user_callouts';
|
|
|
|
const showSuggestPopover = false;
|
2018-11-08 19:23:39 +05:30
|
|
|
|
|
|
|
testAction(
|
2018-11-20 20:47:30 +05:30
|
|
|
setBaseConfig,
|
2020-01-01 13:55:28 +05:30
|
|
|
{
|
|
|
|
endpoint,
|
|
|
|
endpointBatch,
|
|
|
|
endpointMetadata,
|
2020-04-08 14:13:33 +05:30
|
|
|
endpointCoverage,
|
2020-01-01 13:55:28 +05:30
|
|
|
projectPath,
|
|
|
|
dismissEndpoint,
|
|
|
|
showSuggestPopover,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
endpoint: '',
|
|
|
|
endpointBatch: '',
|
|
|
|
endpointMetadata: '',
|
2020-04-08 14:13:33 +05:30
|
|
|
endpointCoverage: '',
|
2020-01-01 13:55:28 +05:30
|
|
|
projectPath: '',
|
|
|
|
dismissEndpoint: '',
|
|
|
|
showSuggestPopover: true,
|
|
|
|
},
|
2019-09-04 21:01:54 +05:30
|
|
|
[
|
|
|
|
{
|
|
|
|
type: types.SET_BASE_CONFIG,
|
2020-01-01 13:55:28 +05:30
|
|
|
payload: {
|
|
|
|
endpoint,
|
|
|
|
endpointMetadata,
|
|
|
|
endpointBatch,
|
2020-04-08 14:13:33 +05:30
|
|
|
endpointCoverage,
|
2020-01-01 13:55:28 +05:30
|
|
|
projectPath,
|
|
|
|
dismissEndpoint,
|
|
|
|
showSuggestPopover,
|
|
|
|
},
|
2019-09-04 21:01:54 +05:30
|
|
|
},
|
|
|
|
],
|
2018-11-08 19:23:39 +05:30
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2020-01-01 13:55:28 +05:30
|
|
|
describe('fetchDiffFilesBatch', () => {
|
2020-06-23 00:09:42 +05:30
|
|
|
let mock;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
mock = new MockAdapter(axios);
|
|
|
|
});
|
|
|
|
|
|
|
|
afterEach(() => {
|
|
|
|
mock.restore();
|
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should fetch batch diff files', (done) => {
|
2020-01-01 13:55:28 +05:30
|
|
|
const endpointBatch = '/fetch/diffs_batch';
|
2021-09-30 23:02:18 +05:30
|
|
|
const res1 = { diff_files: [{ file_hash: 'test' }], pagination: { total_pages: 7 } };
|
|
|
|
const res2 = { diff_files: [{ file_hash: 'test2' }], pagination: { total_pages: 7 } };
|
2020-01-01 13:55:28 +05:30
|
|
|
mock
|
2020-06-23 00:09:42 +05:30
|
|
|
.onGet(
|
|
|
|
mergeUrlParams(
|
|
|
|
{
|
|
|
|
w: '1',
|
|
|
|
view: 'inline',
|
2021-09-30 23:02:18 +05:30
|
|
|
page: 0,
|
|
|
|
per_page: 5,
|
2020-06-23 00:09:42 +05:30
|
|
|
},
|
|
|
|
endpointBatch,
|
|
|
|
),
|
|
|
|
)
|
2020-03-13 15:44:24 +05:30
|
|
|
.reply(200, res1)
|
2020-06-23 00:09:42 +05:30
|
|
|
.onGet(
|
|
|
|
mergeUrlParams(
|
|
|
|
{
|
|
|
|
w: '1',
|
|
|
|
view: 'inline',
|
2021-09-30 23:02:18 +05:30
|
|
|
page: 5,
|
|
|
|
per_page: 7,
|
2020-06-23 00:09:42 +05:30
|
|
|
},
|
|
|
|
endpointBatch,
|
|
|
|
),
|
|
|
|
)
|
2020-01-01 13:55:28 +05:30
|
|
|
.reply(200, res2);
|
|
|
|
|
|
|
|
testAction(
|
|
|
|
fetchDiffFilesBatch,
|
|
|
|
{},
|
2020-11-24 15:15:51 +05:30
|
|
|
{ endpointBatch, diffViewType: 'inline' },
|
2020-01-01 13:55:28 +05:30
|
|
|
[
|
2021-11-11 11:23:49 +05:30
|
|
|
{ type: types.SET_BATCH_LOADING_STATE, payload: 'loading' },
|
2020-03-13 15:44:24 +05:30
|
|
|
{ type: types.SET_RETRIEVING_BATCHES, payload: true },
|
2020-01-01 13:55:28 +05:30
|
|
|
{ type: types.SET_DIFF_DATA_BATCH, payload: { diff_files: res1.diff_files } },
|
2021-11-11 11:23:49 +05:30
|
|
|
{ type: types.SET_BATCH_LOADING_STATE, payload: 'loaded' },
|
2020-11-24 15:15:51 +05:30
|
|
|
{ type: types.VIEW_DIFF_FILE, payload: 'test' },
|
2020-07-28 23:09:34 +05:30
|
|
|
{ type: types.SET_DIFF_DATA_BATCH, payload: { diff_files: res2.diff_files } },
|
2021-11-11 11:23:49 +05:30
|
|
|
{ type: types.SET_BATCH_LOADING_STATE, payload: 'loaded' },
|
2020-11-24 15:15:51 +05:30
|
|
|
{ type: types.VIEW_DIFF_FILE, payload: 'test2' },
|
2020-03-13 15:44:24 +05:30
|
|
|
{ type: types.SET_RETRIEVING_BATCHES, payload: false },
|
2021-11-11 11:23:49 +05:30
|
|
|
{ type: types.SET_BATCH_LOADING_STATE, payload: 'error' },
|
2020-01-01 13:55:28 +05:30
|
|
|
],
|
2021-04-29 21:17:54 +05:30
|
|
|
[{ type: 'startRenderDiffsQueue' }, { type: 'startRenderDiffsQueue' }],
|
2020-06-23 00:09:42 +05:30
|
|
|
done,
|
2020-01-01 13:55:28 +05:30
|
|
|
);
|
|
|
|
});
|
2020-06-23 00:09:42 +05:30
|
|
|
|
|
|
|
it.each`
|
|
|
|
viewStyle | otherView
|
|
|
|
${'inline'} | ${'parallel'}
|
|
|
|
${'parallel'} | ${'inline'}
|
|
|
|
`(
|
|
|
|
'should make a request with the view parameter "$viewStyle" when the batchEndpoint already contains "$otherView"',
|
|
|
|
({ viewStyle, otherView }) => {
|
|
|
|
const endpointBatch = '/fetch/diffs_batch';
|
|
|
|
|
|
|
|
fetchDiffFilesBatch({
|
|
|
|
commit: () => {},
|
|
|
|
state: {
|
|
|
|
endpointBatch: `${endpointBatch}?view=${otherView}`,
|
|
|
|
diffViewType: viewStyle,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
.then(() => {
|
|
|
|
expect(mock.history.get[0].url).toContain(`view=${viewStyle}`);
|
|
|
|
expect(mock.history.get[0].url).not.toContain(`view=${otherView}`);
|
|
|
|
})
|
|
|
|
.catch(() => {});
|
|
|
|
},
|
|
|
|
);
|
2020-01-01 13:55:28 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
describe('fetchDiffFilesMeta', () => {
|
2020-06-23 00:09:42 +05:30
|
|
|
const endpointMetadata = '/fetch/diffs_metadata.json?view=inline';
|
|
|
|
const noFilesData = { ...diffMetadata };
|
|
|
|
let mock;
|
2020-01-01 13:55:28 +05:30
|
|
|
|
2020-06-23 00:09:42 +05:30
|
|
|
beforeEach(() => {
|
|
|
|
mock = new MockAdapter(axios);
|
|
|
|
|
|
|
|
delete noFilesData.diff_files;
|
|
|
|
|
|
|
|
mock.onGet(endpointMetadata).reply(200, diffMetadata);
|
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should fetch diff meta information', (done) => {
|
2020-01-01 13:55:28 +05:30
|
|
|
testAction(
|
|
|
|
fetchDiffFilesMeta,
|
|
|
|
{},
|
2020-11-24 15:15:51 +05:30
|
|
|
{ endpointMetadata, diffViewType: 'inline' },
|
2020-01-01 13:55:28 +05:30
|
|
|
[
|
|
|
|
{ type: types.SET_LOADING, payload: true },
|
|
|
|
{ type: types.SET_LOADING, payload: false },
|
2020-06-23 00:09:42 +05:30
|
|
|
{ type: types.SET_MERGE_REQUEST_DIFFS, payload: diffMetadata.merge_request_diffs },
|
2021-02-22 17:27:13 +05:30
|
|
|
{ type: types.SET_DIFF_METADATA, payload: noFilesData },
|
2021-04-29 21:17:54 +05:30
|
|
|
// Workers are synchronous in Jest environment (see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58805)
|
2021-09-04 01:27:46 +05:30
|
|
|
{
|
|
|
|
type: types.SET_TREE_DATA,
|
|
|
|
payload: workerUtils.generateTreeList(diffMetadata.diff_files),
|
|
|
|
},
|
2020-01-01 13:55:28 +05:30
|
|
|
],
|
|
|
|
[],
|
|
|
|
() => {
|
|
|
|
mock.restore();
|
|
|
|
done();
|
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2020-04-08 14:13:33 +05:30
|
|
|
describe('fetchCoverageFiles', () => {
|
|
|
|
let mock;
|
|
|
|
const endpointCoverage = '/fetch';
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
mock = new MockAdapter(axios);
|
|
|
|
});
|
|
|
|
|
|
|
|
afterEach(() => mock.restore());
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should commit SET_COVERAGE_DATA with received response', (done) => {
|
|
|
|
const data = { files: { 'app.js': { 1: 0, 2: 1 } } };
|
2020-04-08 14:13:33 +05:30
|
|
|
|
|
|
|
mock.onGet(endpointCoverage).reply(200, { data });
|
|
|
|
|
|
|
|
testAction(
|
|
|
|
fetchCoverageFiles,
|
|
|
|
{},
|
|
|
|
{ endpointCoverage },
|
|
|
|
[{ type: types.SET_COVERAGE_DATA, payload: { data } }],
|
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should show flash on API error', (done) => {
|
2020-04-08 14:13:33 +05:30
|
|
|
mock.onGet(endpointCoverage).reply(400);
|
|
|
|
|
|
|
|
testAction(fetchCoverageFiles, {}, { endpointCoverage }, [], [], () => {
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(createFlash).toHaveBeenCalledTimes(1);
|
2021-09-04 01:27:46 +05:30
|
|
|
expect(createFlash).toHaveBeenCalledWith({
|
|
|
|
message: expect.stringMatching('Something went wrong'),
|
|
|
|
});
|
2020-04-08 14:13:33 +05:30
|
|
|
done();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
describe('setHighlightedRow', () => {
|
2019-07-07 11:18:12 +05:30
|
|
|
it('should mark currently selected diff and set lineHash and fileHash of highlightedRow', () => {
|
2019-02-15 15:39:39 +05:30
|
|
|
testAction(setHighlightedRow, 'ABC_123', {}, [
|
|
|
|
{ type: types.SET_HIGHLIGHTED_ROW, payload: 'ABC_123' },
|
2020-11-24 15:15:51 +05:30
|
|
|
{ type: types.VIEW_DIFF_FILE, payload: 'ABC' },
|
2019-02-15 15:39:39 +05:30
|
|
|
]);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
describe('assignDiscussionsToDiff', () => {
|
2020-07-28 23:09:34 +05:30
|
|
|
afterEach(() => {
|
|
|
|
window.location.hash = '';
|
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should merge discussions into diffs', (done) => {
|
2020-03-13 15:44:24 +05:30
|
|
|
window.location.hash = 'ABC_123';
|
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
const state = {
|
|
|
|
diffFiles: [
|
|
|
|
{
|
2019-02-15 15:39:39 +05:30
|
|
|
file_hash: 'ABC',
|
|
|
|
parallel_diff_lines: [
|
2018-11-20 20:47:30 +05:30
|
|
|
{
|
|
|
|
left: {
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_1_1',
|
2018-11-20 20:47:30 +05:30
|
|
|
discussions: [],
|
|
|
|
},
|
|
|
|
right: {
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_1_1',
|
2018-11-20 20:47:30 +05:30
|
|
|
discussions: [],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
2019-02-15 15:39:39 +05:30
|
|
|
highlighted_diff_lines: [
|
2018-11-20 20:47:30 +05:30
|
|
|
{
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_1_1',
|
2018-11-20 20:47:30 +05:30
|
|
|
discussions: [],
|
2019-02-15 15:39:39 +05:30
|
|
|
old_line: 5,
|
|
|
|
new_line: null,
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
],
|
2019-02-15 15:39:39 +05:30
|
|
|
diff_refs: {
|
|
|
|
base_sha: 'abc',
|
|
|
|
head_sha: 'def',
|
|
|
|
start_sha: 'ghi',
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
2019-02-15 15:39:39 +05:30
|
|
|
new_path: 'file1',
|
|
|
|
old_path: 'file2',
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
],
|
|
|
|
};
|
|
|
|
|
|
|
|
const diffPosition = {
|
2019-02-15 15:39:39 +05:30
|
|
|
base_sha: 'abc',
|
|
|
|
head_sha: 'def',
|
|
|
|
start_sha: 'ghi',
|
|
|
|
new_line: null,
|
|
|
|
new_path: 'file1',
|
|
|
|
old_line: 5,
|
|
|
|
old_path: 'file2',
|
2018-11-20 20:47:30 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
const singleDiscussion = {
|
|
|
|
line_code: 'ABC_1_1',
|
|
|
|
diff_discussion: {},
|
|
|
|
diff_file: {
|
|
|
|
file_hash: 'ABC',
|
|
|
|
},
|
2019-02-15 15:39:39 +05:30
|
|
|
file_hash: 'ABC',
|
2018-11-20 20:47:30 +05:30
|
|
|
resolvable: true,
|
|
|
|
position: diffPosition,
|
|
|
|
original_position: diffPosition,
|
|
|
|
};
|
|
|
|
|
2018-12-13 13:39:08 +05:30
|
|
|
const discussions = [singleDiscussion];
|
2018-11-20 20:47:30 +05:30
|
|
|
|
|
|
|
testAction(
|
|
|
|
assignDiscussionsToDiff,
|
|
|
|
discussions,
|
|
|
|
state,
|
|
|
|
[
|
|
|
|
{
|
|
|
|
type: types.SET_LINE_DISCUSSIONS_FOR_FILE,
|
|
|
|
payload: {
|
2018-12-13 13:39:08 +05:30
|
|
|
discussion: singleDiscussion,
|
2018-11-20 20:47:30 +05:30
|
|
|
diffPositionByLineCode: {
|
|
|
|
ABC_1_1: {
|
2019-02-15 15:39:39 +05:30
|
|
|
base_sha: 'abc',
|
|
|
|
head_sha: 'def',
|
|
|
|
start_sha: 'ghi',
|
|
|
|
new_line: null,
|
|
|
|
new_path: 'file1',
|
|
|
|
old_line: 5,
|
|
|
|
old_path: 'file2',
|
2020-06-23 00:09:42 +05:30
|
|
|
line_range: null,
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_1_1',
|
|
|
|
position_type: 'text',
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
},
|
2019-12-04 20:38:33 +05:30
|
|
|
hash: 'ABC_123',
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
[],
|
2019-02-15 15:39:39 +05:30
|
|
|
done,
|
2018-11-20 20:47:30 +05:30
|
|
|
);
|
|
|
|
});
|
2020-07-28 23:09:34 +05:30
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('dispatches setCurrentDiffFileIdFromNote with note ID', (done) => {
|
2020-07-28 23:09:34 +05:30
|
|
|
window.location.hash = 'note_123';
|
|
|
|
|
|
|
|
testAction(
|
|
|
|
assignDiscussionsToDiff,
|
|
|
|
[],
|
2020-11-24 15:15:51 +05:30
|
|
|
{ diffFiles: [] },
|
2020-07-28 23:09:34 +05:30
|
|
|
[],
|
|
|
|
[{ type: 'setCurrentDiffFileIdFromNote', payload: '123' }],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
describe('removeDiscussionsFromDiff', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should remove discussions from diffs', (done) => {
|
2018-11-20 20:47:30 +05:30
|
|
|
const state = {
|
|
|
|
diffFiles: [
|
|
|
|
{
|
2019-02-15 15:39:39 +05:30
|
|
|
file_hash: 'ABC',
|
|
|
|
parallel_diff_lines: [
|
2018-11-20 20:47:30 +05:30
|
|
|
{
|
|
|
|
left: {
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_1_1',
|
2018-11-20 20:47:30 +05:30
|
|
|
discussions: [
|
|
|
|
{
|
|
|
|
id: 1,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
right: {
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_1_1',
|
2018-11-20 20:47:30 +05:30
|
|
|
discussions: [],
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
2019-02-15 15:39:39 +05:30
|
|
|
highlighted_diff_lines: [
|
2018-11-20 20:47:30 +05:30
|
|
|
{
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_1_1',
|
2018-11-20 20:47:30 +05:30
|
|
|
discussions: [],
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
],
|
|
|
|
};
|
|
|
|
const singleDiscussion = {
|
2018-12-13 13:39:08 +05:30
|
|
|
id: '1',
|
2019-02-15 15:39:39 +05:30
|
|
|
file_hash: 'ABC',
|
2018-11-20 20:47:30 +05:30
|
|
|
line_code: 'ABC_1_1',
|
|
|
|
};
|
|
|
|
|
|
|
|
testAction(
|
|
|
|
removeDiscussionsFromDiff,
|
|
|
|
singleDiscussion,
|
|
|
|
state,
|
|
|
|
[
|
|
|
|
{
|
|
|
|
type: types.REMOVE_LINE_DISCUSSIONS_FOR_FILE,
|
|
|
|
payload: {
|
2018-12-13 13:39:08 +05:30
|
|
|
id: '1',
|
2018-11-20 20:47:30 +05:30
|
|
|
fileHash: 'ABC',
|
|
|
|
lineCode: 'ABC_1_1',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
[],
|
2019-02-15 15:39:39 +05:30
|
|
|
done,
|
2018-11-20 20:47:30 +05:30
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('startRenderDiffsQueue', () => {
|
2018-12-05 23:21:45 +05:30
|
|
|
it('should set all files to RENDER_FILE', () => {
|
2018-11-20 20:47:30 +05:30
|
|
|
const state = {
|
|
|
|
diffFiles: [
|
|
|
|
{
|
|
|
|
id: 1,
|
|
|
|
renderIt: false,
|
2019-07-07 11:18:12 +05:30
|
|
|
viewer: {
|
2021-01-03 14:25:43 +05:30
|
|
|
automaticallyCollapsed: false,
|
2019-07-07 11:18:12 +05:30
|
|
|
},
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
{
|
|
|
|
id: 2,
|
|
|
|
renderIt: false,
|
2019-07-07 11:18:12 +05:30
|
|
|
viewer: {
|
2021-01-03 14:25:43 +05:30
|
|
|
automaticallyCollapsed: false,
|
2019-07-07 11:18:12 +05:30
|
|
|
},
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
],
|
|
|
|
};
|
|
|
|
|
|
|
|
const pseudoCommit = (commitType, file) => {
|
|
|
|
expect(commitType).toBe(types.RENDER_FILE);
|
|
|
|
Object.assign(file, {
|
|
|
|
renderIt: true,
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
2018-12-05 23:21:45 +05:30
|
|
|
startRenderDiffsQueue({ state, commit: pseudoCommit });
|
2018-11-20 20:47:30 +05:30
|
|
|
|
2018-12-05 23:21:45 +05:30
|
|
|
expect(state.diffFiles[0].renderIt).toBe(true);
|
|
|
|
expect(state.diffFiles[1].renderIt).toBe(true);
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
describe('setInlineDiffViewType', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should set diff view type to inline and also set the cookie properly', (done) => {
|
2018-11-08 19:23:39 +05:30
|
|
|
testAction(
|
2018-11-20 20:47:30 +05:30
|
|
|
setInlineDiffViewType,
|
2018-11-08 19:23:39 +05:30
|
|
|
null,
|
|
|
|
{},
|
|
|
|
[{ type: types.SET_DIFF_VIEW_TYPE, payload: INLINE_DIFF_VIEW_TYPE }],
|
|
|
|
[],
|
|
|
|
() => {
|
2020-04-22 19:07:51 +05:30
|
|
|
setImmediate(() => {
|
2018-11-08 19:23:39 +05:30
|
|
|
expect(Cookies.get('diff_view')).toEqual(INLINE_DIFF_VIEW_TYPE);
|
|
|
|
done();
|
2020-04-22 19:07:51 +05:30
|
|
|
});
|
2018-11-08 19:23:39 +05:30
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('setParallelDiffViewType', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should set diff view type to parallel and also set the cookie properly', (done) => {
|
2018-11-08 19:23:39 +05:30
|
|
|
testAction(
|
2018-11-20 20:47:30 +05:30
|
|
|
setParallelDiffViewType,
|
2018-11-08 19:23:39 +05:30
|
|
|
null,
|
|
|
|
{},
|
|
|
|
[{ type: types.SET_DIFF_VIEW_TYPE, payload: PARALLEL_DIFF_VIEW_TYPE }],
|
|
|
|
[],
|
|
|
|
() => {
|
2020-04-22 19:07:51 +05:30
|
|
|
setImmediate(() => {
|
2018-11-08 19:23:39 +05:30
|
|
|
expect(Cookies.get(DIFF_VIEW_COOKIE_NAME)).toEqual(PARALLEL_DIFF_VIEW_TYPE);
|
|
|
|
done();
|
2020-04-22 19:07:51 +05:30
|
|
|
});
|
2018-11-08 19:23:39 +05:30
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('showCommentForm', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should call mutation to show comment form', (done) => {
|
2019-02-15 15:39:39 +05:30
|
|
|
const payload = { lineCode: 'lineCode', fileHash: 'hash' };
|
2018-11-08 19:23:39 +05:30
|
|
|
|
|
|
|
testAction(
|
2018-11-20 20:47:30 +05:30
|
|
|
showCommentForm,
|
2018-11-08 19:23:39 +05:30
|
|
|
payload,
|
|
|
|
{},
|
2019-02-15 15:39:39 +05:30
|
|
|
[{ type: types.TOGGLE_LINE_HAS_FORM, payload: { ...payload, hasForm: true } }],
|
2018-11-08 19:23:39 +05:30
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('cancelCommentForm', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should call mutation to cancel comment form', (done) => {
|
2019-02-15 15:39:39 +05:30
|
|
|
const payload = { lineCode: 'lineCode', fileHash: 'hash' };
|
2018-11-08 19:23:39 +05:30
|
|
|
|
|
|
|
testAction(
|
2018-11-20 20:47:30 +05:30
|
|
|
cancelCommentForm,
|
2018-11-08 19:23:39 +05:30
|
|
|
payload,
|
|
|
|
{},
|
2019-02-15 15:39:39 +05:30
|
|
|
[{ type: types.TOGGLE_LINE_HAS_FORM, payload: { ...payload, hasForm: false } }],
|
2018-11-08 19:23:39 +05:30
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('loadMoreLines', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should call mutation to show comment form', (done) => {
|
2018-11-08 19:23:39 +05:30
|
|
|
const endpoint = '/diffs/load/more/lines';
|
|
|
|
const params = { since: 6, to: 26 };
|
|
|
|
const lineNumbers = { oldLineNumber: 3, newLineNumber: 5 };
|
|
|
|
const fileHash = 'ff9200';
|
2019-10-12 21:52:04 +05:30
|
|
|
const isExpandDown = false;
|
|
|
|
const nextLineNumbers = {};
|
|
|
|
const options = { endpoint, params, lineNumbers, fileHash, isExpandDown, nextLineNumbers };
|
2018-11-08 19:23:39 +05:30
|
|
|
const mock = new MockAdapter(axios);
|
|
|
|
const contextLines = { contextLines: [{ lineCode: 6 }] };
|
|
|
|
mock.onGet(endpoint).reply(200, contextLines);
|
|
|
|
|
|
|
|
testAction(
|
2018-11-20 20:47:30 +05:30
|
|
|
loadMoreLines,
|
2018-11-08 19:23:39 +05:30
|
|
|
options,
|
|
|
|
{},
|
|
|
|
[
|
|
|
|
{
|
|
|
|
type: types.ADD_CONTEXT_LINES,
|
2019-10-12 21:52:04 +05:30
|
|
|
payload: { lineNumbers, contextLines, params, fileHash, isExpandDown, nextLineNumbers },
|
2018-11-08 19:23:39 +05:30
|
|
|
},
|
|
|
|
],
|
|
|
|
[],
|
|
|
|
() => {
|
|
|
|
mock.restore();
|
|
|
|
done();
|
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('loadCollapsedDiff', () => {
|
2019-09-04 21:01:54 +05:30
|
|
|
const state = { showWhitespace: true };
|
2021-03-08 18:12:59 +05:30
|
|
|
it('should fetch data and call mutation with response and the give parameter', (done) => {
|
2019-02-15 15:39:39 +05:30
|
|
|
const file = { hash: 123, load_collapsed_diff_url: '/load/collapsed/diff/url' };
|
2018-11-08 19:23:39 +05:30
|
|
|
const data = { hash: 123, parallelDiffLines: [{ lineCode: 1 }] };
|
|
|
|
const mock = new MockAdapter(axios);
|
2020-04-22 19:07:51 +05:30
|
|
|
const commit = jest.fn();
|
2018-11-08 19:23:39 +05:30
|
|
|
mock.onGet(file.loadCollapsedDiffUrl).reply(200, data);
|
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
loadCollapsedDiff({ commit, getters: { commitId: null }, state }, file)
|
2019-02-15 15:39:39 +05:30
|
|
|
.then(() => {
|
|
|
|
expect(commit).toHaveBeenCalledWith(types.ADD_COLLAPSED_DIFFS, { file, data });
|
|
|
|
|
2018-11-08 19:23:39 +05:30
|
|
|
mock.restore();
|
|
|
|
done();
|
2019-02-15 15:39:39 +05:30
|
|
|
})
|
|
|
|
.catch(done.fail);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should fetch data without commit ID', () => {
|
|
|
|
const file = { load_collapsed_diff_url: '/load/collapsed/diff/url' };
|
|
|
|
const getters = {
|
|
|
|
commitId: null,
|
|
|
|
};
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
jest.spyOn(axios, 'get').mockReturnValue(Promise.resolve({ data: {} }));
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
loadCollapsedDiff({ commit() {}, getters, state }, file);
|
2019-02-15 15:39:39 +05:30
|
|
|
|
|
|
|
expect(axios.get).toHaveBeenCalledWith(file.load_collapsed_diff_url, {
|
2019-09-04 21:01:54 +05:30
|
|
|
params: { commit_id: null, w: '0' },
|
2019-02-15 15:39:39 +05:30
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
it('should fetch data with commit ID', () => {
|
|
|
|
const file = { load_collapsed_diff_url: '/load/collapsed/diff/url' };
|
|
|
|
const getters = {
|
|
|
|
commitId: '123',
|
|
|
|
};
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
jest.spyOn(axios, 'get').mockReturnValue(Promise.resolve({ data: {} }));
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
loadCollapsedDiff({ commit() {}, getters, state }, file);
|
2019-02-15 15:39:39 +05:30
|
|
|
|
|
|
|
expect(axios.get).toHaveBeenCalledWith(file.load_collapsed_diff_url, {
|
2019-09-04 21:01:54 +05:30
|
|
|
params: { commit_id: '123', w: '0' },
|
2019-02-15 15:39:39 +05:30
|
|
|
});
|
2018-11-08 19:23:39 +05:30
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('toggleFileDiscussions', () => {
|
|
|
|
it('should dispatch collapseDiscussion when all discussions are expanded', () => {
|
|
|
|
const getters = {
|
2020-04-22 19:07:51 +05:30
|
|
|
getDiffFileDiscussions: jest.fn(() => [{ id: 1 }]),
|
|
|
|
diffHasAllExpandedDiscussions: jest.fn(() => true),
|
|
|
|
diffHasAllCollapsedDiscussions: jest.fn(() => false),
|
2018-11-08 19:23:39 +05:30
|
|
|
};
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
const dispatch = jest.fn();
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
toggleFileDiscussions({ getters, dispatch });
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
expect(dispatch).toHaveBeenCalledWith(
|
|
|
|
'collapseDiscussion',
|
|
|
|
{ discussionId: 1 },
|
|
|
|
{ root: true },
|
|
|
|
);
|
2018-11-08 19:23:39 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('should dispatch expandDiscussion when all discussions are collapsed', () => {
|
|
|
|
const getters = {
|
2020-04-22 19:07:51 +05:30
|
|
|
getDiffFileDiscussions: jest.fn(() => [{ id: 1 }]),
|
|
|
|
diffHasAllExpandedDiscussions: jest.fn(() => false),
|
|
|
|
diffHasAllCollapsedDiscussions: jest.fn(() => true),
|
2018-11-08 19:23:39 +05:30
|
|
|
};
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
const dispatch = jest.fn();
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
toggleFileDiscussions({ getters, dispatch });
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
expect(dispatch).toHaveBeenCalledWith(
|
|
|
|
'expandDiscussion',
|
|
|
|
{ discussionId: 1 },
|
|
|
|
{ root: true },
|
|
|
|
);
|
2018-11-08 19:23:39 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('should dispatch expandDiscussion when some discussions are collapsed and others are expanded for the collapsed discussion', () => {
|
|
|
|
const getters = {
|
2020-04-22 19:07:51 +05:30
|
|
|
getDiffFileDiscussions: jest.fn(() => [{ expanded: false, id: 1 }]),
|
|
|
|
diffHasAllExpandedDiscussions: jest.fn(() => false),
|
|
|
|
diffHasAllCollapsedDiscussions: jest.fn(() => false),
|
2018-11-08 19:23:39 +05:30
|
|
|
};
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
const dispatch = jest.fn();
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2018-11-20 20:47:30 +05:30
|
|
|
toggleFileDiscussions({ getters, dispatch });
|
|
|
|
|
|
|
|
expect(dispatch).toHaveBeenCalledWith(
|
|
|
|
'expandDiscussion',
|
|
|
|
{ discussionId: 1 },
|
|
|
|
{ root: true },
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('scrollToLineIfNeededInline', () => {
|
|
|
|
const lineMock = {
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_123',
|
2018-11-20 20:47:30 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
it('should not call handleLocationHash when there is not hash', () => {
|
|
|
|
window.location.hash = '';
|
|
|
|
|
|
|
|
scrollToLineIfNeededInline({}, lineMock);
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(commonUtils.handleLocationHash).not.toHaveBeenCalled();
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('should not call handleLocationHash when the hash does not match any line', () => {
|
|
|
|
window.location.hash = 'XYZ_456';
|
|
|
|
|
|
|
|
scrollToLineIfNeededInline({}, lineMock);
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(commonUtils.handleLocationHash).not.toHaveBeenCalled();
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('should call handleLocationHash only when the hash matches a line', () => {
|
|
|
|
window.location.hash = 'ABC_123';
|
|
|
|
|
|
|
|
scrollToLineIfNeededInline(
|
|
|
|
{},
|
|
|
|
{
|
|
|
|
lineCode: 'ABC_456',
|
|
|
|
},
|
|
|
|
);
|
|
|
|
scrollToLineIfNeededInline({}, lineMock);
|
|
|
|
scrollToLineIfNeededInline(
|
|
|
|
{},
|
|
|
|
{
|
|
|
|
lineCode: 'XYZ_456',
|
|
|
|
},
|
|
|
|
);
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(commonUtils.handleLocationHash).toHaveBeenCalled();
|
|
|
|
expect(commonUtils.handleLocationHash).toHaveBeenCalledTimes(1);
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('scrollToLineIfNeededParallel', () => {
|
|
|
|
const lineMock = {
|
|
|
|
left: null,
|
|
|
|
right: {
|
2019-02-15 15:39:39 +05:30
|
|
|
line_code: 'ABC_123',
|
2018-11-20 20:47:30 +05:30
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
it('should not call handleLocationHash when there is not hash', () => {
|
|
|
|
window.location.hash = '';
|
|
|
|
|
|
|
|
scrollToLineIfNeededParallel({}, lineMock);
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(commonUtils.handleLocationHash).not.toHaveBeenCalled();
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('should not call handleLocationHash when the hash does not match any line', () => {
|
|
|
|
window.location.hash = 'XYZ_456';
|
|
|
|
|
|
|
|
scrollToLineIfNeededParallel({}, lineMock);
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(commonUtils.handleLocationHash).not.toHaveBeenCalled();
|
2018-11-20 20:47:30 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('should call handleLocationHash only when the hash matches a line', () => {
|
|
|
|
window.location.hash = 'ABC_123';
|
|
|
|
|
|
|
|
scrollToLineIfNeededParallel(
|
|
|
|
{},
|
|
|
|
{
|
|
|
|
left: null,
|
|
|
|
right: {
|
|
|
|
lineCode: 'ABC_456',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
);
|
|
|
|
scrollToLineIfNeededParallel({}, lineMock);
|
|
|
|
scrollToLineIfNeededParallel(
|
|
|
|
{},
|
|
|
|
{
|
|
|
|
left: null,
|
|
|
|
right: {
|
|
|
|
lineCode: 'XYZ_456',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
);
|
2018-11-08 19:23:39 +05:30
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(commonUtils.handleLocationHash).toHaveBeenCalled();
|
|
|
|
expect(commonUtils.handleLocationHash).toHaveBeenCalledTimes(1);
|
2018-11-08 19:23:39 +05:30
|
|
|
});
|
|
|
|
});
|
2018-12-05 23:21:45 +05:30
|
|
|
|
|
|
|
describe('saveDiffDiscussion', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('dispatches actions', (done) => {
|
2019-02-15 15:39:39 +05:30
|
|
|
const commitId = 'something';
|
|
|
|
const formData = {
|
|
|
|
diffFile: { ...mockDiffFile },
|
|
|
|
noteableData: {},
|
|
|
|
};
|
|
|
|
const note = {};
|
|
|
|
const state = {
|
|
|
|
commit: {
|
|
|
|
id: commitId,
|
|
|
|
},
|
|
|
|
};
|
2021-03-08 18:12:59 +05:30
|
|
|
const dispatch = jest.fn((name) => {
|
2018-12-05 23:21:45 +05:30
|
|
|
switch (name) {
|
|
|
|
case 'saveNote':
|
|
|
|
return Promise.resolve({
|
|
|
|
discussion: 'test',
|
|
|
|
});
|
|
|
|
case 'updateDiscussion':
|
|
|
|
return Promise.resolve('discussion');
|
|
|
|
default:
|
|
|
|
return Promise.resolve({});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2019-02-15 15:39:39 +05:30
|
|
|
saveDiffDiscussion({ state, dispatch }, { note, formData })
|
2018-12-05 23:21:45 +05:30
|
|
|
.then(() => {
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(dispatch).toHaveBeenCalledTimes(5);
|
|
|
|
expect(dispatch).toHaveBeenNthCalledWith(1, 'saveNote', expect.any(Object), {
|
|
|
|
root: true,
|
|
|
|
});
|
2019-02-15 15:39:39 +05:30
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
const postData = dispatch.mock.calls[0][1];
|
2019-02-15 15:39:39 +05:30
|
|
|
expect(postData.data.note.commit_id).toBe(commitId);
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(dispatch).toHaveBeenNthCalledWith(2, 'updateDiscussion', 'test', { root: true });
|
|
|
|
expect(dispatch).toHaveBeenNthCalledWith(3, 'assignDiscussionsToDiff', ['discussion']);
|
2018-12-05 23:21:45 +05:30
|
|
|
})
|
|
|
|
.then(done)
|
|
|
|
.catch(done.fail);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('toggleTreeOpen', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits TOGGLE_FOLDER_OPEN', (done) => {
|
2018-12-05 23:21:45 +05:30
|
|
|
testAction(
|
|
|
|
toggleTreeOpen,
|
|
|
|
'path',
|
|
|
|
{},
|
|
|
|
[{ type: types.TOGGLE_FOLDER_OPEN, payload: 'path' }],
|
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('scrollToFile', () => {
|
|
|
|
let commit;
|
2021-10-27 15:23:28 +05:30
|
|
|
const getters = { isVirtualScrollingEnabled: false };
|
2018-12-05 23:21:45 +05:30
|
|
|
|
|
|
|
beforeEach(() => {
|
2020-04-22 19:07:51 +05:30
|
|
|
commit = jest.fn();
|
2018-12-05 23:21:45 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('updates location hash', () => {
|
|
|
|
const state = {
|
|
|
|
treeEntries: {
|
|
|
|
path: {
|
|
|
|
fileHash: 'test',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2021-10-27 15:23:28 +05:30
|
|
|
scrollToFile({ state, commit, getters }, 'path');
|
2018-12-05 23:21:45 +05:30
|
|
|
|
|
|
|
expect(document.location.hash).toBe('#test');
|
|
|
|
});
|
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
it('commits VIEW_DIFF_FILE', () => {
|
2018-12-05 23:21:45 +05:30
|
|
|
const state = {
|
|
|
|
treeEntries: {
|
|
|
|
path: {
|
|
|
|
fileHash: 'test',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2021-10-27 15:23:28 +05:30
|
|
|
scrollToFile({ state, commit, getters }, 'path');
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
expect(commit).toHaveBeenCalledWith(types.VIEW_DIFF_FILE, 'test');
|
2018-12-05 23:21:45 +05:30
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2021-02-22 17:27:13 +05:30
|
|
|
describe('setShowTreeList', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits toggle', (done) => {
|
2021-02-22 17:27:13 +05:30
|
|
|
testAction(
|
|
|
|
setShowTreeList,
|
|
|
|
{ showTreeList: true },
|
|
|
|
{},
|
|
|
|
[{ type: types.SET_SHOW_TREE_LIST, payload: true }],
|
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
2018-12-05 23:21:45 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('updates localStorage', () => {
|
2020-04-22 19:07:51 +05:30
|
|
|
jest.spyOn(localStorage, 'setItem').mockImplementation(() => {});
|
2018-12-05 23:21:45 +05:30
|
|
|
|
2021-02-22 17:27:13 +05:30
|
|
|
setShowTreeList({ commit() {} }, { showTreeList: true });
|
2018-12-05 23:21:45 +05:30
|
|
|
|
|
|
|
expect(localStorage.setItem).toHaveBeenCalledWith('mr_tree_show', true);
|
|
|
|
});
|
2019-07-07 11:18:12 +05:30
|
|
|
|
|
|
|
it('does not update localStorage', () => {
|
2020-04-22 19:07:51 +05:30
|
|
|
jest.spyOn(localStorage, 'setItem').mockImplementation(() => {});
|
2019-07-07 11:18:12 +05:30
|
|
|
|
2021-02-22 17:27:13 +05:30
|
|
|
setShowTreeList({ commit() {} }, { showTreeList: true, saving: false });
|
2019-07-07 11:18:12 +05:30
|
|
|
|
|
|
|
expect(localStorage.setItem).not.toHaveBeenCalled();
|
|
|
|
});
|
2018-12-05 23:21:45 +05:30
|
|
|
});
|
2019-02-15 15:39:39 +05:30
|
|
|
|
|
|
|
describe('renderFileForDiscussionId', () => {
|
|
|
|
const rootState = {
|
|
|
|
notes: {
|
|
|
|
discussions: [
|
|
|
|
{
|
|
|
|
id: '123',
|
|
|
|
diff_file: {
|
|
|
|
file_hash: 'HASH',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
id: '456',
|
|
|
|
diff_file: {
|
|
|
|
file_hash: 'HASH',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
},
|
|
|
|
};
|
|
|
|
let commit;
|
|
|
|
let $emit;
|
|
|
|
const state = ({ collapsed, renderIt }) => ({
|
|
|
|
diffFiles: [
|
|
|
|
{
|
|
|
|
file_hash: 'HASH',
|
2019-07-07 11:18:12 +05:30
|
|
|
viewer: {
|
2021-01-03 14:25:43 +05:30
|
|
|
automaticallyCollapsed: collapsed,
|
2019-07-07 11:18:12 +05:30
|
|
|
},
|
2019-02-15 15:39:39 +05:30
|
|
|
renderIt,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
});
|
|
|
|
|
|
|
|
beforeEach(() => {
|
2020-04-22 19:07:51 +05:30
|
|
|
commit = jest.fn();
|
|
|
|
$emit = jest.spyOn(eventHub, '$emit');
|
2019-02-15 15:39:39 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('renders and expands file for the given discussion id', () => {
|
|
|
|
const localState = state({ collapsed: true, renderIt: false });
|
|
|
|
|
|
|
|
renderFileForDiscussionId({ rootState, state: localState, commit }, '123');
|
|
|
|
|
|
|
|
expect(commit).toHaveBeenCalledWith('RENDER_FILE', localState.diffFiles[0]);
|
|
|
|
expect($emit).toHaveBeenCalledTimes(1);
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(commonUtils.scrollToElement).toHaveBeenCalledTimes(1);
|
2019-02-15 15:39:39 +05:30
|
|
|
});
|
|
|
|
|
|
|
|
it('jumps to discussion on already rendered and expanded file', () => {
|
|
|
|
const localState = state({ collapsed: false, renderIt: true });
|
|
|
|
|
|
|
|
renderFileForDiscussionId({ rootState, state: localState, commit }, '123');
|
|
|
|
|
|
|
|
expect(commit).not.toHaveBeenCalled();
|
|
|
|
expect($emit).toHaveBeenCalledTimes(1);
|
2020-04-22 19:07:51 +05:30
|
|
|
expect(commonUtils.scrollToElement).not.toHaveBeenCalled();
|
2019-02-15 15:39:39 +05:30
|
|
|
});
|
|
|
|
});
|
2019-03-02 22:35:43 +05:30
|
|
|
|
|
|
|
describe('setRenderTreeList', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits SET_RENDER_TREE_LIST', (done) => {
|
2019-03-02 22:35:43 +05:30
|
|
|
testAction(
|
|
|
|
setRenderTreeList,
|
2021-10-27 15:23:28 +05:30
|
|
|
{ renderTreeList: true },
|
2019-03-02 22:35:43 +05:30
|
|
|
{},
|
|
|
|
[{ type: types.SET_RENDER_TREE_LIST, payload: true }],
|
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
|
|
|
it('sets localStorage', () => {
|
2021-10-27 15:23:28 +05:30
|
|
|
setRenderTreeList({ commit() {} }, { renderTreeList: true });
|
2019-03-02 22:35:43 +05:30
|
|
|
|
|
|
|
expect(localStorage.setItem).toHaveBeenCalledWith('mr_diff_tree_list', true);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('setShowWhitespace', () => {
|
2021-09-04 01:27:46 +05:30
|
|
|
const endpointUpdateUser = 'user/prefs';
|
|
|
|
let putSpy;
|
|
|
|
let mock;
|
2021-09-30 23:02:18 +05:30
|
|
|
let gon;
|
2021-09-04 01:27:46 +05:30
|
|
|
|
2019-09-04 21:01:54 +05:30
|
|
|
beforeEach(() => {
|
2021-09-04 01:27:46 +05:30
|
|
|
mock = new MockAdapter(axios);
|
|
|
|
putSpy = jest.spyOn(axios, 'put');
|
2021-09-30 23:02:18 +05:30
|
|
|
gon = window.gon;
|
2021-09-04 01:27:46 +05:30
|
|
|
|
|
|
|
mock.onPut(endpointUpdateUser).reply(200, {});
|
2020-04-22 19:07:51 +05:30
|
|
|
jest.spyOn(eventHub, '$emit').mockImplementation();
|
2019-09-04 21:01:54 +05:30
|
|
|
});
|
|
|
|
|
2021-09-04 01:27:46 +05:30
|
|
|
afterEach(() => {
|
|
|
|
mock.restore();
|
2021-09-30 23:02:18 +05:30
|
|
|
window.gon = gon;
|
2021-09-04 01:27:46 +05:30
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits SET_SHOW_WHITESPACE', (done) => {
|
2019-03-02 22:35:43 +05:30
|
|
|
testAction(
|
|
|
|
setShowWhitespace,
|
2021-09-04 01:27:46 +05:30
|
|
|
{ showWhitespace: true, updateDatabase: false },
|
2019-03-02 22:35:43 +05:30
|
|
|
{},
|
|
|
|
[{ type: types.SET_SHOW_WHITESPACE, payload: true }],
|
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
2021-09-30 23:02:18 +05:30
|
|
|
it('saves to the database when the user is logged in', async () => {
|
|
|
|
window.gon = { current_user_id: 12345 };
|
|
|
|
|
2021-09-04 01:27:46 +05:30
|
|
|
await setShowWhitespace(
|
|
|
|
{ state: { endpointUpdateUser }, commit() {} },
|
|
|
|
{ showWhitespace: true, updateDatabase: true },
|
|
|
|
);
|
2019-09-04 21:01:54 +05:30
|
|
|
|
2021-09-04 01:27:46 +05:30
|
|
|
expect(putSpy).toHaveBeenCalledWith(endpointUpdateUser, { show_whitespace_in_diffs: true });
|
2019-09-04 21:01:54 +05:30
|
|
|
});
|
|
|
|
|
2021-09-30 23:02:18 +05:30
|
|
|
it('does not try to save to the API if the user is not logged in', async () => {
|
|
|
|
window.gon = {};
|
|
|
|
|
|
|
|
await setShowWhitespace(
|
|
|
|
{ state: { endpointUpdateUser }, commit() {} },
|
|
|
|
{ showWhitespace: true, updateDatabase: true },
|
|
|
|
);
|
|
|
|
|
|
|
|
expect(putSpy).not.toHaveBeenCalled();
|
|
|
|
});
|
|
|
|
|
2021-09-04 01:27:46 +05:30
|
|
|
it('emits eventHub event', async () => {
|
|
|
|
await setShowWhitespace(
|
|
|
|
{ state: {}, commit() {} },
|
|
|
|
{ showWhitespace: true, updateDatabase: false },
|
|
|
|
);
|
2019-09-04 21:01:54 +05:30
|
|
|
|
|
|
|
expect(eventHub.$emit).toHaveBeenCalledWith('refetchDiffData');
|
|
|
|
});
|
2019-03-02 22:35:43 +05:30
|
|
|
});
|
2019-07-07 11:18:12 +05:30
|
|
|
|
|
|
|
describe('setRenderIt', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits RENDER_FILE', (done) => {
|
2019-07-07 11:18:12 +05:30
|
|
|
testAction(setRenderIt, 'file', {}, [{ type: types.RENDER_FILE, payload: 'file' }], [], done);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('receiveFullDiffError', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('updates state with the file that did not load', (done) => {
|
2019-07-07 11:18:12 +05:30
|
|
|
testAction(
|
|
|
|
receiveFullDiffError,
|
|
|
|
'file',
|
|
|
|
{},
|
|
|
|
[{ type: types.RECEIVE_FULL_DIFF_ERROR, payload: 'file' }],
|
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('fetchFullDiff', () => {
|
|
|
|
let mock;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
mock = new MockAdapter(axios);
|
|
|
|
});
|
|
|
|
|
|
|
|
afterEach(() => {
|
|
|
|
mock.restore();
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('success', () => {
|
|
|
|
beforeEach(() => {
|
2020-07-28 23:09:34 +05:30
|
|
|
mock.onGet(`${TEST_HOST}/context`).replyOnce(200, ['test']);
|
2019-07-07 11:18:12 +05:30
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits the success and dispatches an action to expand the new lines', (done) => {
|
2019-07-31 22:56:46 +05:30
|
|
|
const file = {
|
2020-07-28 23:09:34 +05:30
|
|
|
context_lines_path: `${TEST_HOST}/context`,
|
2019-07-31 22:56:46 +05:30
|
|
|
file_path: 'test',
|
|
|
|
file_hash: 'test',
|
|
|
|
};
|
2019-07-07 11:18:12 +05:30
|
|
|
testAction(
|
|
|
|
fetchFullDiff,
|
2019-07-31 22:56:46 +05:30
|
|
|
file,
|
2019-07-07 11:18:12 +05:30
|
|
|
null,
|
2020-06-23 00:09:42 +05:30
|
|
|
[{ type: types.RECEIVE_FULL_DIFF_SUCCESS, payload: { filePath: 'test' } }],
|
|
|
|
[{ type: 'setExpandedDiffLines', payload: { file, data: ['test'] } }],
|
2019-07-07 11:18:12 +05:30
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('error', () => {
|
|
|
|
beforeEach(() => {
|
2020-07-28 23:09:34 +05:30
|
|
|
mock.onGet(`${TEST_HOST}/context`).replyOnce(500);
|
2019-07-07 11:18:12 +05:30
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('dispatches receiveFullDiffError', (done) => {
|
2019-07-07 11:18:12 +05:30
|
|
|
testAction(
|
|
|
|
fetchFullDiff,
|
2020-07-28 23:09:34 +05:30
|
|
|
{ context_lines_path: `${TEST_HOST}/context`, file_path: 'test', file_hash: 'test' },
|
2019-07-07 11:18:12 +05:30
|
|
|
null,
|
|
|
|
[],
|
|
|
|
[{ type: 'receiveFullDiffError', payload: 'test' }],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('toggleFullDiff', () => {
|
|
|
|
let state;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
state = {
|
|
|
|
diffFiles: [{ file_path: 'test', isShowingFullFile: false }],
|
|
|
|
};
|
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('dispatches fetchFullDiff when file is not expanded', (done) => {
|
2019-07-07 11:18:12 +05:30
|
|
|
testAction(
|
|
|
|
toggleFullDiff,
|
|
|
|
'test',
|
|
|
|
state,
|
2020-06-23 00:09:42 +05:30
|
|
|
[{ type: types.REQUEST_FULL_DIFF, payload: 'test' }],
|
|
|
|
[{ type: 'fetchFullDiff', payload: state.diffFiles[0] }],
|
2019-07-07 11:18:12 +05:30
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2020-05-24 23:13:21 +05:30
|
|
|
describe('switchToFullDiffFromRenamedFile', () => {
|
|
|
|
const SUCCESS_URL = 'fakehost/context.success';
|
|
|
|
const testFilePath = 'testpath';
|
|
|
|
const updatedViewerName = 'testviewer';
|
|
|
|
const preparedLine = { prepared: 'in-a-test' };
|
|
|
|
const testFile = {
|
|
|
|
file_path: testFilePath,
|
|
|
|
file_hash: 'testhash',
|
|
|
|
alternate_viewer: { name: updatedViewerName },
|
|
|
|
};
|
2021-01-29 00:20:46 +05:30
|
|
|
const updatedViewer = {
|
|
|
|
name: updatedViewerName,
|
|
|
|
automaticallyCollapsed: false,
|
|
|
|
manuallyCollapsed: false,
|
|
|
|
};
|
2020-05-24 23:13:21 +05:30
|
|
|
const testData = [{ rich_text: 'test' }, { rich_text: 'file2' }];
|
|
|
|
let renamedFile;
|
|
|
|
let mock;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
mock = new MockAdapter(axios);
|
|
|
|
jest.spyOn(utils, 'prepareLineForRenamedFile').mockImplementation(() => preparedLine);
|
|
|
|
});
|
|
|
|
|
|
|
|
afterEach(() => {
|
|
|
|
renamedFile = null;
|
|
|
|
mock.restore();
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('success', () => {
|
|
|
|
beforeEach(() => {
|
|
|
|
renamedFile = { ...testFile, context_lines_path: SUCCESS_URL };
|
|
|
|
mock.onGet(SUCCESS_URL).replyOnce(200, testData);
|
|
|
|
});
|
|
|
|
|
|
|
|
it.each`
|
|
|
|
diffViewType
|
|
|
|
${INLINE_DIFF_VIEW_TYPE}
|
|
|
|
${PARALLEL_DIFF_VIEW_TYPE}
|
|
|
|
`(
|
|
|
|
'performs the correct mutations and starts a render queue for view type $diffViewType',
|
|
|
|
({ diffViewType }) => {
|
|
|
|
return testAction(
|
|
|
|
switchToFullDiffFromRenamedFile,
|
|
|
|
{ diffFile: renamedFile },
|
|
|
|
{ diffViewType },
|
|
|
|
[
|
|
|
|
{
|
|
|
|
type: types.SET_DIFF_FILE_VIEWER,
|
|
|
|
payload: { filePath: testFilePath, viewer: updatedViewer },
|
|
|
|
},
|
|
|
|
{
|
|
|
|
type: types.SET_CURRENT_VIEW_DIFF_FILE_LINES,
|
|
|
|
payload: { filePath: testFilePath, lines: [preparedLine, preparedLine] },
|
|
|
|
},
|
|
|
|
],
|
|
|
|
[{ type: 'startRenderDiffsQueue' }],
|
|
|
|
);
|
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2021-01-29 00:20:46 +05:30
|
|
|
describe('setFileUserCollapsed', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits SET_FILE_COLLAPSED', (done) => {
|
2019-07-07 11:18:12 +05:30
|
|
|
testAction(
|
2021-01-29 00:20:46 +05:30
|
|
|
setFileCollapsedByUser,
|
2019-07-07 11:18:12 +05:30
|
|
|
{ filePath: 'test', collapsed: true },
|
|
|
|
null,
|
2021-01-29 00:20:46 +05:30
|
|
|
[
|
|
|
|
{
|
|
|
|
type: types.SET_FILE_COLLAPSED,
|
|
|
|
payload: { filePath: 'test', collapsed: true, trigger: 'manual' },
|
|
|
|
},
|
|
|
|
],
|
2019-07-07 11:18:12 +05:30
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
2019-07-31 22:56:46 +05:30
|
|
|
|
|
|
|
describe('setExpandedDiffLines', () => {
|
|
|
|
beforeEach(() => {
|
2021-03-08 18:12:59 +05:30
|
|
|
utils.idleCallback.mockImplementation((cb) => {
|
2019-07-31 22:56:46 +05:30
|
|
|
cb({ timeRemaining: () => 50 });
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits SET_CURRENT_VIEW_DIFF_FILE_LINES when lines less than MAX_RENDERING_DIFF_LINES', (done) => {
|
2020-04-22 19:07:51 +05:30
|
|
|
utils.convertExpandLines.mockImplementation(() => ['test']);
|
2019-07-31 22:56:46 +05:30
|
|
|
|
|
|
|
testAction(
|
|
|
|
setExpandedDiffLines,
|
|
|
|
{ file: { file_path: 'path' }, data: [] },
|
|
|
|
{ diffViewType: 'inline' },
|
|
|
|
[
|
|
|
|
{
|
|
|
|
type: 'SET_CURRENT_VIEW_DIFF_FILE_LINES',
|
|
|
|
payload: { filePath: 'path', lines: ['test'] },
|
|
|
|
},
|
|
|
|
],
|
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits ADD_CURRENT_VIEW_DIFF_FILE_LINES when lines more than MAX_RENDERING_DIFF_LINES', (done) => {
|
2019-07-31 22:56:46 +05:30
|
|
|
const lines = new Array(501).fill().map((_, i) => `line-${i}`);
|
2020-04-22 19:07:51 +05:30
|
|
|
utils.convertExpandLines.mockReturnValue(lines);
|
2019-07-31 22:56:46 +05:30
|
|
|
|
|
|
|
testAction(
|
|
|
|
setExpandedDiffLines,
|
|
|
|
{ file: { file_path: 'path' }, data: [] },
|
|
|
|
{ diffViewType: 'inline' },
|
|
|
|
[
|
|
|
|
{
|
|
|
|
type: 'SET_CURRENT_VIEW_DIFF_FILE_LINES',
|
|
|
|
payload: { filePath: 'path', lines: lines.slice(0, 200) },
|
|
|
|
},
|
|
|
|
{ type: 'TOGGLE_DIFF_FILE_RENDERING_MORE', payload: 'path' },
|
|
|
|
...new Array(301).fill().map((_, i) => ({
|
|
|
|
type: 'ADD_CURRENT_VIEW_DIFF_FILE_LINES',
|
|
|
|
payload: { filePath: 'path', line: `line-${i + 200}` },
|
|
|
|
})),
|
|
|
|
{ type: 'TOGGLE_DIFF_FILE_RENDERING_MORE', payload: 'path' },
|
|
|
|
],
|
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
2019-09-04 21:01:54 +05:30
|
|
|
|
|
|
|
describe('setSuggestPopoverDismissed', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits SET_SHOW_SUGGEST_POPOVER', (done) => {
|
2020-07-28 23:09:34 +05:30
|
|
|
const state = { dismissEndpoint: `${TEST_HOST}/-/user_callouts` };
|
2019-09-04 21:01:54 +05:30
|
|
|
const mock = new MockAdapter(axios);
|
|
|
|
mock.onPost(state.dismissEndpoint).reply(200, {});
|
|
|
|
|
2020-04-22 19:07:51 +05:30
|
|
|
jest.spyOn(axios, 'post');
|
2019-09-04 21:01:54 +05:30
|
|
|
|
|
|
|
testAction(
|
|
|
|
setSuggestPopoverDismissed,
|
|
|
|
null,
|
|
|
|
state,
|
|
|
|
[{ type: types.SET_SHOW_SUGGEST_POPOVER }],
|
|
|
|
[],
|
|
|
|
() => {
|
|
|
|
expect(axios.post).toHaveBeenCalledWith(state.dismissEndpoint, {
|
|
|
|
feature_name: 'suggest_popover_dismissed',
|
|
|
|
});
|
|
|
|
|
|
|
|
mock.restore();
|
|
|
|
done();
|
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
2020-05-24 23:13:21 +05:30
|
|
|
|
|
|
|
describe('changeCurrentCommit', () => {
|
|
|
|
it('commits the new commit information and re-requests the diff metadata for the commit', () => {
|
|
|
|
return testAction(
|
|
|
|
changeCurrentCommit,
|
|
|
|
{ commitId: 'NEW' },
|
|
|
|
{
|
|
|
|
commit: {
|
|
|
|
id: 'OLD',
|
|
|
|
},
|
|
|
|
endpoint: 'URL/OLD',
|
|
|
|
endpointBatch: 'URL/OLD',
|
|
|
|
endpointMetadata: 'URL/OLD',
|
|
|
|
},
|
|
|
|
[
|
|
|
|
{ type: types.SET_DIFF_FILES, payload: [] },
|
|
|
|
{
|
|
|
|
type: types.SET_BASE_CONFIG,
|
|
|
|
payload: {
|
|
|
|
commit: {
|
|
|
|
id: 'OLD', // Not a typo: the action fired next will overwrite all of the `commit` in state
|
|
|
|
},
|
|
|
|
endpoint: 'URL/NEW',
|
|
|
|
endpointBatch: 'URL/NEW',
|
|
|
|
endpointMetadata: 'URL/NEW',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
],
|
|
|
|
[{ type: 'fetchDiffFilesMeta' }],
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
|
|
|
it.each`
|
|
|
|
commitId | commit | msg
|
|
|
|
${undefined} | ${{ id: 'OLD' }} | ${'`commitId` is a required argument'}
|
|
|
|
${'NEW'} | ${null} | ${'`state` must already contain a valid `commit`'}
|
|
|
|
${undefined} | ${null} | ${'`commitId` is a required argument'}
|
|
|
|
`(
|
|
|
|
'returns a rejected promise with the error message $msg given `{ "commitId": $commitId, "state.commit": $commit }`',
|
|
|
|
({ commitId, commit, msg }) => {
|
|
|
|
const err = new Error(msg);
|
|
|
|
const actionReturn = testAction(
|
|
|
|
changeCurrentCommit,
|
|
|
|
{ commitId },
|
|
|
|
{
|
|
|
|
endpoint: 'URL/OLD',
|
|
|
|
endpointBatch: 'URL/OLD',
|
|
|
|
endpointMetadata: 'URL/OLD',
|
|
|
|
commit,
|
|
|
|
},
|
|
|
|
[],
|
|
|
|
[],
|
|
|
|
);
|
|
|
|
|
|
|
|
return expect(actionReturn).rejects.toStrictEqual(err);
|
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('moveToNeighboringCommit', () => {
|
|
|
|
it.each`
|
|
|
|
direction | expected | currentCommit
|
|
|
|
${'next'} | ${'NEXTSHA'} | ${{ next_commit_id: 'NEXTSHA' }}
|
|
|
|
${'previous'} | ${'PREVIOUSSHA'} | ${{ prev_commit_id: 'PREVIOUSSHA' }}
|
|
|
|
`(
|
|
|
|
'for the direction "$direction", dispatches the action to move to the SHA "$expected"',
|
|
|
|
({ direction, expected, currentCommit }) => {
|
|
|
|
return testAction(
|
|
|
|
moveToNeighboringCommit,
|
|
|
|
{ direction },
|
|
|
|
{ commit: currentCommit },
|
|
|
|
[],
|
|
|
|
[{ type: 'changeCurrentCommit', payload: { commitId: expected } }],
|
|
|
|
);
|
|
|
|
},
|
|
|
|
);
|
|
|
|
|
|
|
|
it.each`
|
|
|
|
direction | diffsAreLoading | currentCommit
|
|
|
|
${'next'} | ${false} | ${{ prev_commit_id: 'PREVIOUSSHA' }}
|
|
|
|
${'next'} | ${true} | ${{ prev_commit_id: 'PREVIOUSSHA' }}
|
|
|
|
${'next'} | ${false} | ${undefined}
|
|
|
|
${'previous'} | ${false} | ${{ next_commit_id: 'NEXTSHA' }}
|
|
|
|
${'previous'} | ${true} | ${{ next_commit_id: 'NEXTSHA' }}
|
|
|
|
${'previous'} | ${false} | ${undefined}
|
|
|
|
`(
|
|
|
|
'given `{ "isloading": $diffsAreLoading, "commit": $currentCommit }` in state, no actions are dispatched',
|
|
|
|
({ direction, diffsAreLoading, currentCommit }) => {
|
|
|
|
return testAction(
|
|
|
|
moveToNeighboringCommit,
|
|
|
|
{ direction },
|
|
|
|
{ commit: currentCommit, isLoading: diffsAreLoading },
|
|
|
|
[],
|
|
|
|
[],
|
|
|
|
);
|
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
2020-07-28 23:09:34 +05:30
|
|
|
|
|
|
|
describe('setCurrentDiffFileIdFromNote', () => {
|
2020-11-24 15:15:51 +05:30
|
|
|
it('commits VIEW_DIFF_FILE', () => {
|
2020-07-28 23:09:34 +05:30
|
|
|
const commit = jest.fn();
|
2020-10-24 23:57:45 +05:30
|
|
|
const state = { diffFiles: [{ file_hash: '123' }] };
|
2020-07-28 23:09:34 +05:30
|
|
|
const rootGetters = {
|
|
|
|
getDiscussion: () => ({ diff_file: { file_hash: '123' } }),
|
2021-03-08 18:12:59 +05:30
|
|
|
notesById: { 1: { discussion_id: '2' } },
|
2020-07-28 23:09:34 +05:30
|
|
|
};
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
setCurrentDiffFileIdFromNote({ commit, state, rootGetters }, '1');
|
2020-07-28 23:09:34 +05:30
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
expect(commit).toHaveBeenCalledWith(types.VIEW_DIFF_FILE, '123');
|
2020-07-28 23:09:34 +05:30
|
|
|
});
|
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
it('does not commit VIEW_DIFF_FILE when discussion has no diff_file', () => {
|
2020-07-28 23:09:34 +05:30
|
|
|
const commit = jest.fn();
|
2020-10-24 23:57:45 +05:30
|
|
|
const state = { diffFiles: [{ file_hash: '123' }] };
|
2020-07-28 23:09:34 +05:30
|
|
|
const rootGetters = {
|
|
|
|
getDiscussion: () => ({ id: '1' }),
|
2021-03-08 18:12:59 +05:30
|
|
|
notesById: { 1: { discussion_id: '2' } },
|
2020-07-28 23:09:34 +05:30
|
|
|
};
|
|
|
|
|
2020-10-24 23:57:45 +05:30
|
|
|
setCurrentDiffFileIdFromNote({ commit, state, rootGetters }, '1');
|
|
|
|
|
|
|
|
expect(commit).not.toHaveBeenCalled();
|
|
|
|
});
|
|
|
|
|
2020-11-24 15:15:51 +05:30
|
|
|
it('does not commit VIEW_DIFF_FILE when diff file does not exist', () => {
|
2020-10-24 23:57:45 +05:30
|
|
|
const commit = jest.fn();
|
|
|
|
const state = { diffFiles: [{ file_hash: '123' }] };
|
|
|
|
const rootGetters = {
|
|
|
|
getDiscussion: () => ({ diff_file: { file_hash: '124' } }),
|
2021-03-08 18:12:59 +05:30
|
|
|
notesById: { 1: { discussion_id: '2' } },
|
2020-10-24 23:57:45 +05:30
|
|
|
};
|
|
|
|
|
|
|
|
setCurrentDiffFileIdFromNote({ commit, state, rootGetters }, '1');
|
2020-07-28 23:09:34 +05:30
|
|
|
|
|
|
|
expect(commit).not.toHaveBeenCalled();
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
describe('navigateToDiffFileIndex', () => {
|
2021-03-08 18:12:59 +05:30
|
|
|
it('commits VIEW_DIFF_FILE', (done) => {
|
2020-07-28 23:09:34 +05:30
|
|
|
testAction(
|
|
|
|
navigateToDiffFileIndex,
|
|
|
|
0,
|
|
|
|
{ diffFiles: [{ file_hash: '123' }] },
|
2020-11-24 15:15:51 +05:30
|
|
|
[{ type: types.VIEW_DIFF_FILE, payload: '123' }],
|
2020-07-28 23:09:34 +05:30
|
|
|
[],
|
|
|
|
done,
|
|
|
|
);
|
|
|
|
});
|
|
|
|
});
|
2021-02-22 17:27:13 +05:30
|
|
|
|
|
|
|
describe('setFileByFile', () => {
|
2021-04-29 21:17:54 +05:30
|
|
|
const updateUserEndpoint = 'user/prefs';
|
|
|
|
let putSpy;
|
|
|
|
let mock;
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
mock = new MockAdapter(axios);
|
|
|
|
putSpy = jest.spyOn(axios, 'put');
|
|
|
|
|
|
|
|
mock.onPut(updateUserEndpoint).reply(200, {});
|
|
|
|
});
|
|
|
|
|
|
|
|
afterEach(() => {
|
|
|
|
mock.restore();
|
|
|
|
});
|
|
|
|
|
2021-02-22 17:27:13 +05:30
|
|
|
it.each`
|
|
|
|
value
|
|
|
|
${true}
|
|
|
|
${false}
|
2021-04-29 21:17:54 +05:30
|
|
|
`(
|
|
|
|
'commits SET_FILE_BY_FILE and persists the File-by-File user preference with the new value $value',
|
|
|
|
async ({ value }) => {
|
|
|
|
await testAction(
|
|
|
|
setFileByFile,
|
|
|
|
{ fileByFile: value },
|
|
|
|
{
|
|
|
|
viewDiffsFileByFile: null,
|
|
|
|
endpointUpdateUser: updateUserEndpoint,
|
|
|
|
},
|
|
|
|
[{ type: types.SET_FILE_BY_FILE, payload: value }],
|
|
|
|
[],
|
|
|
|
);
|
|
|
|
|
|
|
|
expect(putSpy).toHaveBeenCalledWith(updateUserEndpoint, { view_diffs_file_by_file: value });
|
|
|
|
},
|
|
|
|
);
|
2021-02-22 17:27:13 +05:30
|
|
|
});
|
2021-03-08 18:12:59 +05:30
|
|
|
|
|
|
|
describe('reviewFile', () => {
|
|
|
|
const file = {
|
|
|
|
id: '123',
|
|
|
|
file_identifier_hash: 'abc',
|
|
|
|
load_collapsed_diff_url: 'gitlab-org/gitlab-test/-/merge_requests/1/diffs',
|
|
|
|
};
|
|
|
|
it.each`
|
|
|
|
reviews | diffFile | reviewed
|
|
|
|
${{ abc: ['123'] }} | ${file} | ${true}
|
|
|
|
${{}} | ${file} | ${false}
|
|
|
|
`(
|
|
|
|
'sets reviews ($reviews) to localStorage and state for file $file if it is marked reviewed=$reviewed',
|
|
|
|
({ reviews, diffFile, reviewed }) => {
|
|
|
|
const commitSpy = jest.fn();
|
|
|
|
const getterSpy = jest.fn().mockReturnValue([]);
|
|
|
|
|
|
|
|
reviewFile(
|
|
|
|
{
|
|
|
|
commit: commitSpy,
|
|
|
|
getters: {
|
|
|
|
fileReviews: getterSpy,
|
|
|
|
},
|
|
|
|
state: {
|
|
|
|
mrReviews: { abc: ['123'] },
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
file: diffFile,
|
|
|
|
reviewed,
|
|
|
|
},
|
|
|
|
);
|
|
|
|
|
|
|
|
expect(localStorage.setItem).toHaveBeenCalledTimes(1);
|
|
|
|
expect(localStorage.setItem).toHaveBeenCalledWith(
|
|
|
|
'gitlab-org/gitlab-test/-/merge_requests/1-file-reviews',
|
|
|
|
JSON.stringify(reviews),
|
|
|
|
);
|
|
|
|
expect(commitSpy).toHaveBeenCalledWith(types.SET_MR_FILE_REVIEWS, reviews);
|
|
|
|
},
|
|
|
|
);
|
|
|
|
});
|
2018-11-08 19:23:39 +05:30
|
|
|
});
|