Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-01-07 11:55:43 +0300
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-01-16 21:12:48 +0300
commitfc2432592b33c70d21a4e7f91c359da4b668a706 (patch)
tree6673eb429f619d23c77e47d4eebb6631f6c55627 /spec
parent7914dd79d7d1df970628a1dd55b7794e6b2c0237 (diff)
Merge branch 'suggestion-dashes' into 'master'
Fixes diff sugestions removing dashes from diff Closes #55634 See merge request gitlab-org/gitlab-ce!23994 (cherry picked from commit 32f80629bdbd4d2fcd43b6220da373394ffd95b6) e6f1209e Fixes diff sugestions removing dashes from diff
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/vue_shared/components/markdown/suggestions_spec.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js b/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js
index ab1b747c360..423cd6dee0f 100644
--- a/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js
+++ b/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js
@@ -29,7 +29,7 @@ const generateLine = content => {
const generateMockLines = () => {
const line1 = generateLine('Line 1');
const line2 = generateLine('Line 2');
- const line3 = generateLine('Line 3');
+ const line3 = generateLine('- Line 3');
const container = document.createElement('div');
container.appendChild(line1);
@@ -80,7 +80,7 @@ describe('Suggestion component', () => {
const expectedReturn = [
{ content: 'Line 1\n', lineNumber: 1 },
{ content: 'Line 2\n', lineNumber: 2 },
- { content: 'Line 3\n', lineNumber: 3 },
+ { content: '- Line 3\n', lineNumber: 3 },
];
expect(vm.extractNewLines(generateMockLines())).toEqual(expectedReturn);