From b8b2cb3675a38fa0460add7a1cab03abbaeb56fd Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Sat, 1 Sep 2018 23:24:29 +0200 Subject: Fixed Problems with Inline View + Specs --- spec/javascripts/diffs/mock_data/diff_file.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'spec/javascripts/diffs/mock_data') diff --git a/spec/javascripts/diffs/mock_data/diff_file.js b/spec/javascripts/diffs/mock_data/diff_file.js index cce36ecc91f..12de1bc4d51 100644 --- a/spec/javascripts/diffs/mock_data/diff_file.js +++ b/spec/javascripts/diffs/mock_data/diff_file.js @@ -49,6 +49,7 @@ export default { type: 'new', oldLine: null, newLine: 1, + discussions: [], text: '+ - Bad dates\n', richText: '+ - Bad dates\n', metaData: null, @@ -58,6 +59,7 @@ export default { type: 'new', oldLine: null, newLine: 2, + discussions: [], text: '+\n', richText: '+\n', metaData: null, @@ -67,6 +69,7 @@ export default { type: null, oldLine: 1, newLine: 3, + discussions: [], text: ' v6.8.0\n', richText: ' v6.8.0\n', metaData: null, @@ -76,6 +79,7 @@ export default { type: null, oldLine: 2, newLine: 4, + discussions: [], text: ' \n', richText: ' \n', metaData: null, @@ -85,6 +89,7 @@ export default { type: null, oldLine: 3, newLine: 5, + discussions: [], text: ' v6.7.0\n', richText: ' v6.7.0\n', metaData: null, @@ -112,6 +117,7 @@ export default { type: 'new', oldLine: null, newLine: 1, + discussions: [], text: '+ - Bad dates\n', richText: ' - Bad dates\n', metaData: null, @@ -126,6 +132,7 @@ export default { type: 'new', oldLine: null, newLine: 2, + discussions: [], text: '+\n', richText: '\n', metaData: null, @@ -137,6 +144,7 @@ export default { type: null, oldLine: 1, newLine: 3, + discussions: [], text: ' v6.8.0\n', richText: 'v6.8.0\n', metaData: null, @@ -146,6 +154,7 @@ export default { type: null, oldLine: 1, newLine: 3, + discussions: [], text: ' v6.8.0\n', richText: 'v6.8.0\n', metaData: null, @@ -157,6 +166,7 @@ export default { type: null, oldLine: 2, newLine: 4, + discussions: [], text: ' \n', richText: '\n', metaData: null, @@ -166,6 +176,7 @@ export default { type: null, oldLine: 2, newLine: 4, + discussions: [], text: ' \n', richText: '\n', metaData: null, @@ -177,6 +188,7 @@ export default { type: null, oldLine: 3, newLine: 5, + discussions: [], text: ' v6.7.0\n', richText: 'v6.7.0\n', metaData: null, @@ -186,6 +198,7 @@ export default { type: null, oldLine: 3, newLine: 5, + discussions: [], text: ' v6.7.0\n', richText: 'v6.7.0\n', metaData: null, @@ -197,6 +210,7 @@ export default { type: 'match', oldLine: null, newLine: null, + discussions: [], text: '', richText: '', metaData: { @@ -209,6 +223,7 @@ export default { type: 'match', oldLine: null, newLine: null, + discussions: [], text: '', richText: '', metaData: { -- cgit v1.2.1 From a424e8141bc42dec5d3caaf87ee08a7d6308866a Mon Sep 17 00:00:00 2001 From: Tim Zallmann Date: Sun, 2 Sep 2018 12:44:51 +0200 Subject: Fixes for Karma Tests --- spec/javascripts/diffs/mock_data/diff_file.js | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/javascripts/diffs/mock_data') diff --git a/spec/javascripts/diffs/mock_data/diff_file.js b/spec/javascripts/diffs/mock_data/diff_file.js index 12de1bc4d51..372b8f066cf 100644 --- a/spec/javascripts/diffs/mock_data/diff_file.js +++ b/spec/javascripts/diffs/mock_data/diff_file.js @@ -99,6 +99,7 @@ export default { type: 'match', oldLine: null, newLine: null, + discussions: [], text: '', richText: '', metaData: { -- cgit v1.2.1 From d95c1f0335f7309114fcbb0d5413b28e1701a640 Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Fri, 7 Sep 2018 13:39:20 +0000 Subject: Use ResourceLabelEvent for tracking label changes --- spec/javascripts/diffs/mock_data/diff_discussions.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'spec/javascripts/diffs/mock_data') diff --git a/spec/javascripts/diffs/mock_data/diff_discussions.js b/spec/javascripts/diffs/mock_data/diff_discussions.js index 41d0dfd8939..b29a22da7c2 100644 --- a/spec/javascripts/diffs/mock_data/diff_discussions.js +++ b/spec/javascripts/diffs/mock_data/diff_discussions.js @@ -16,7 +16,7 @@ export default { expanded: true, notes: [ { - id: 1749, + id: '1749', type: 'DiffNote', attachment: null, author: { @@ -68,7 +68,7 @@ export default { '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, { - id: 1753, + id: '1753', type: 'DiffNote', attachment: null, author: { @@ -120,7 +120,7 @@ export default { '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, { - id: 1754, + id: '1754', type: 'DiffNote', attachment: null, author: { @@ -162,7 +162,7 @@ export default { '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, { - id: 1755, + id: '1755', type: 'DiffNote', attachment: null, author: { @@ -204,7 +204,7 @@ export default { '/gitlab-org/gitlab-test/issues/new?discussion_to_resolve=6b232e05bea388c6b043ccc243ba505faac04ea8&merge_request_to_resolve_discussions_of=20', }, { - id: 1756, + id: '1756', type: 'DiffNote', attachment: null, author: { -- cgit v1.2.1