Fixed action & mutation specs
This commit is contained in:
parent
0fba7cca36
commit
81944ec925
2 changed files with 29 additions and 44 deletions
|
@ -161,8 +161,7 @@ describe('DiffsStoreActions', () => {
|
||||||
{
|
{
|
||||||
type: types.SET_LINE_DISCUSSIONS_FOR_FILE,
|
type: types.SET_LINE_DISCUSSIONS_FOR_FILE,
|
||||||
payload: {
|
payload: {
|
||||||
diffFile: state.diffFiles[0],
|
discussion: singleDiscussion,
|
||||||
discussions: [singleDiscussion],
|
|
||||||
diffPositionByLineCode: {
|
diffPositionByLineCode: {
|
||||||
ABC_1_1: {
|
ABC_1_1: {
|
||||||
baseSha: 'abc',
|
baseSha: 'abc',
|
||||||
|
|
|
@ -198,40 +198,32 @@ describe('DiffsStoreMutations', () => {
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
const discussions = [
|
const discussion = {
|
||||||
{
|
id: 1,
|
||||||
id: 1,
|
line_code: 'ABC_1',
|
||||||
line_code: 'ABC_1',
|
diff_discussion: true,
|
||||||
diff_discussion: true,
|
resolvable: true,
|
||||||
resolvable: true,
|
original_position: diffPosition,
|
||||||
original_position: diffPosition,
|
position: diffPosition,
|
||||||
position: diffPosition,
|
diff_file: {
|
||||||
|
file_hash: state.diffFiles[0].fileHash,
|
||||||
},
|
},
|
||||||
{
|
};
|
||||||
id: 2,
|
|
||||||
line_code: 'ABC_1',
|
|
||||||
diff_discussion: true,
|
|
||||||
resolvable: true,
|
|
||||||
original_position: diffPosition,
|
|
||||||
position: diffPosition,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
const diffPositionByLineCode = {
|
const diffPositionByLineCode = {
|
||||||
ABC_1: diffPosition,
|
ABC_1: diffPosition,
|
||||||
};
|
};
|
||||||
|
|
||||||
mutations[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, {
|
mutations[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, {
|
||||||
diffFile: state.diffFiles[0],
|
discussion,
|
||||||
discussions,
|
|
||||||
diffPositionByLineCode,
|
diffPositionByLineCode,
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(2);
|
expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(1);
|
||||||
expect(state.diffFiles[0].parallelDiffLines[0].left.discussions[1].id).toEqual(2);
|
expect(state.diffFiles[0].parallelDiffLines[0].left.discussions[0].id).toEqual(1);
|
||||||
|
|
||||||
expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(2);
|
expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(1);
|
||||||
expect(state.diffFiles[0].highlightedDiffLines[0].discussions[1].id).toEqual(2);
|
expect(state.diffFiles[0].highlightedDiffLines[0].discussions[0].id).toEqual(1);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should add legacy discussions to the given line', () => {
|
it('should add legacy discussions to the given line', () => {
|
||||||
|
@ -272,36 +264,30 @@ describe('DiffsStoreMutations', () => {
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
};
|
};
|
||||||
const discussions = [
|
const discussion = {
|
||||||
{
|
id: 1,
|
||||||
id: 1,
|
line_code: 'ABC_1',
|
||||||
line_code: 'ABC_1',
|
diff_discussion: true,
|
||||||
diff_discussion: true,
|
active: true,
|
||||||
active: true,
|
diff_file: {
|
||||||
|
file_hash: state.diffFiles[0].fileHash,
|
||||||
},
|
},
|
||||||
{
|
};
|
||||||
id: 2,
|
|
||||||
line_code: 'ABC_1',
|
|
||||||
diff_discussion: true,
|
|
||||||
active: true,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
const diffPositionByLineCode = {
|
const diffPositionByLineCode = {
|
||||||
ABC_1: diffPosition,
|
ABC_1: diffPosition,
|
||||||
};
|
};
|
||||||
|
|
||||||
mutations[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, {
|
mutations[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, {
|
||||||
diffFile: state.diffFiles[0],
|
discussion,
|
||||||
discussions,
|
|
||||||
diffPositionByLineCode,
|
diffPositionByLineCode,
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(2);
|
expect(state.diffFiles[0].parallelDiffLines[0].left.discussions.length).toEqual(1);
|
||||||
expect(state.diffFiles[0].parallelDiffLines[0].left.discussions[1].id).toEqual(2);
|
expect(state.diffFiles[0].parallelDiffLines[0].left.discussions[0].id).toEqual(1);
|
||||||
|
|
||||||
expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(2);
|
expect(state.diffFiles[0].highlightedDiffLines[0].discussions.length).toEqual(1);
|
||||||
expect(state.diffFiles[0].highlightedDiffLines[0].discussions[1].id).toEqual(2);
|
expect(state.diffFiles[0].highlightedDiffLines[0].discussions[0].id).toEqual(1);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue