Fixed diff store actions spec
Updated diff mutations and utils spec to check for legacy notes
This commit is contained in:
parent
8064ab84a6
commit
f9e290b9db
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
title: Correctly show legacy diff notes in the merge request changes tab
|
||||
merge_request:
|
||||
merge_request: 21652
|
||||
author:
|
||||
type: fixed
|
||||
|
|
|
@ -157,6 +157,7 @@ describe('DiffsStoreActions', () => {
|
|||
newPath: 'file1',
|
||||
oldLine: 5,
|
||||
oldPath: 'file2',
|
||||
lineCode: 'ABC_1_1',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
|
@ -229,6 +229,73 @@ describe('DiffsStoreMutations', () => {
|
|||
expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(2);
|
||||
expect(state.diffFiles[0].highlightedDiffLines[0].discussions[1].id).toEqual(2);
|
||||
});
|
||||
|
||||
it('should add legacy discussions to the given line', () => {
|
||||
const diffPosition = {
|
||||
baseSha: 'ed13df29948c41ba367caa757ab3ec4892509910',
|
||||
headSha: 'b921914f9a834ac47e6fd9420f78db0f83559130',
|
||||
newLine: null,
|
||||
newPath: '500-lines-4.txt',
|
||||
oldLine: 5,
|
||||
oldPath: '500-lines-4.txt',
|
||||
startSha: 'ed13df29948c41ba367caa757ab3ec4892509910',
|
||||
lineCode: 'ABC_1',
|
||||
};
|
||||
|
||||
const state = {
|
||||
diffFiles: [
|
||||
{
|
||||
fileHash: 'ABC',
|
||||
parallelDiffLines: [
|
||||
{
|
||||
left: {
|
||||
lineCode: 'ABC_1',
|
||||
discussions: [],
|
||||
},
|
||||
right: {
|
||||
lineCode: 'ABC_1',
|
||||
discussions: [],
|
||||
},
|
||||
},
|
||||
],
|
||||
highlightedDiffLines: [
|
||||
{
|
||||
lineCode: 'ABC_1',
|
||||
discussions: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
};
|
||||
const discussions = [
|
||||
{
|
||||
id: 1,
|
||||
line_code: 'ABC_1',
|
||||
diff_discussion: true,
|
||||
},
|
||||
{
|
||||
id: 2,
|
||||
line_code: 'ABC_1',
|
||||
diff_discussion: true,
|
||||
},
|
||||
];
|
||||
|
||||
const diffPositionByLineCode = {
|
||||
ABC_1: diffPosition,
|
||||
};
|
||||
|
||||
mutations[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, {
|
||||
fileHash: 'ABC',
|
||||
discussions,
|
||||
diffPositionByLineCode,
|
||||
});
|
||||
|
||||
// expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(2);
|
||||
// expect(state.diffFiles[0].parallelDiffLines[0].left.discussions[1].id).toEqual(2);
|
||||
|
||||
// expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(2);
|
||||
// expect(state.diffFiles[0].highlightedDiffLines[0].discussions[1].id).toEqual(2);
|
||||
});
|
||||
});
|
||||
|
||||
describe('REMOVE_LINE_DISCUSSIONS', () => {
|
||||
|
|
|
@ -3,6 +3,7 @@ import {
|
|||
LINE_POSITION_LEFT,
|
||||
LINE_POSITION_RIGHT,
|
||||
TEXT_DIFF_POSITION_TYPE,
|
||||
LEGACY_DIFF_NOTE_TYPE,
|
||||
DIFF_NOTE_TYPE,
|
||||
NEW_LINE_TYPE,
|
||||
OLD_LINE_TYPE,
|
||||
|
@ -151,6 +152,63 @@ describe('DiffsStoreUtils', () => {
|
|||
data: postData,
|
||||
});
|
||||
});
|
||||
|
||||
it('should create legacy note form data', () => {
|
||||
const diffFile = getDiffFileMock();
|
||||
delete diffFile.diffRefs.startSha;
|
||||
|
||||
noteableDataMock.targetType = MERGE_REQUEST_NOTEABLE_TYPE;
|
||||
|
||||
const options = {
|
||||
note: 'Hello world!',
|
||||
noteableData: noteableDataMock,
|
||||
noteableType: MERGE_REQUEST_NOTEABLE_TYPE,
|
||||
diffFile,
|
||||
noteTargetLine: {
|
||||
lineCode: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_3',
|
||||
metaData: null,
|
||||
newLine: 3,
|
||||
oldLine: 1,
|
||||
},
|
||||
diffViewType: PARALLEL_DIFF_VIEW_TYPE,
|
||||
linePosition: LINE_POSITION_LEFT,
|
||||
};
|
||||
|
||||
const position = JSON.stringify({
|
||||
base_sha: diffFile.diffRefs.baseSha,
|
||||
start_sha: undefined,
|
||||
head_sha: diffFile.diffRefs.headSha,
|
||||
old_path: diffFile.oldPath,
|
||||
new_path: diffFile.newPath,
|
||||
position_type: TEXT_DIFF_POSITION_TYPE,
|
||||
old_line: options.noteTargetLine.oldLine,
|
||||
new_line: options.noteTargetLine.newLine,
|
||||
});
|
||||
|
||||
const postData = {
|
||||
view: options.diffViewType,
|
||||
line_type: options.linePosition === LINE_POSITION_RIGHT ? NEW_LINE_TYPE : OLD_LINE_TYPE,
|
||||
merge_request_diff_head_sha: diffFile.diffRefs.headSha,
|
||||
in_reply_to_discussion_id: '',
|
||||
note_project_id: '',
|
||||
target_type: options.noteableType,
|
||||
target_id: options.noteableData.id,
|
||||
note: {
|
||||
noteable_type: options.noteableType,
|
||||
noteable_id: options.noteableData.id,
|
||||
commit_id: '',
|
||||
type: LEGACY_DIFF_NOTE_TYPE,
|
||||
line_code: options.noteTargetLine.lineCode,
|
||||
note: options.note,
|
||||
position,
|
||||
},
|
||||
};
|
||||
|
||||
expect(utils.getNoteFormData(options)).toEqual({
|
||||
endpoint: options.noteableData.create_note_path,
|
||||
data: postData,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('addLineReferences', () => {
|
||||
|
@ -300,5 +358,18 @@ describe('DiffsStoreUtils', () => {
|
|||
utils.isDiscussionApplicableToLine(discussions.outDatedDiscussion1, diffPosition),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it('returns true when line codes match and discussion does not contain position', () => {
|
||||
const discussion = { ...discussions.outDatedDiscussion1, line_code: 'ABC_1' };
|
||||
delete discussion.original_position;
|
||||
delete discussion.position;
|
||||
|
||||
expect(
|
||||
utils.isDiscussionApplicableToLine(discussion, {
|
||||
...diffPosition,
|
||||
lineCode: 'ABC_1',
|
||||
}),
|
||||
).toBe(true);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue