diff options
author | André Luís <me@andr3.net> | 2018-09-08 06:37:41 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-09-08 06:37:41 +0000 |
commit | 04c0d12d1a6cfaa54d2e5f510922b9d27c5c0a77 (patch) | |
tree | a633c79637f18b84b16f67dfca296ac0c1939185 /spec/javascripts/diffs/store/mutations_spec.js | |
parent | 5949f55235da76eac6e204916502843a87a33d97 (diff) | |
download | gitlab-ce-04c0d12d1a6cfaa54d2e5f510922b9d27c5c0a77.tar.gz |
Resolve "Merge requests show outdated discussions on changes tab"
Diffstat (limited to 'spec/javascripts/diffs/store/mutations_spec.js')
-rw-r--r-- | spec/javascripts/diffs/store/mutations_spec.js | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/spec/javascripts/diffs/store/mutations_spec.js b/spec/javascripts/diffs/store/mutations_spec.js index 9a89bc57404..7eeca6712cc 100644 --- a/spec/javascripts/diffs/store/mutations_spec.js +++ b/spec/javascripts/diffs/store/mutations_spec.js @@ -151,6 +151,16 @@ describe('DiffsStoreMutations', () => { describe('SET_LINE_DISCUSSIONS_FOR_FILE', () => { it('should add 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', + }; + const state = { diffFiles: [ { @@ -180,14 +190,38 @@ describe('DiffsStoreMutations', () => { { id: 1, line_code: 'ABC_1', + diff_discussion: true, + resolvable: true, + original_position: { + formatter: diffPosition, + }, + position: { + formatter: diffPosition, + }, }, { id: 2, line_code: 'ABC_1', + diff_discussion: true, + resolvable: true, + original_position: { + formatter: diffPosition, + }, + position: { + formatter: diffPosition, + }, }, ]; - mutations[types.SET_LINE_DISCUSSIONS_FOR_FILE](state, { fileHash: 'ABC', discussions }); + 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); |