Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/spec/frontend/lib/utils/text_markdown_spec.js b/spec/frontend/lib/utils/text_markdown_spec.js
index 85f3bf26f97..acbf1a975b8 100644
--- a/spec/frontend/lib/utils/text_markdown_spec.js
+++ b/spec/frontend/lib/utils/text_markdown_spec.js
@@ -100,7 +100,7 @@ describe('init markdown', () => {
           text: textArea.value,
           tag: '```suggestion:-0+0\n{text}\n```',
           blockTag: true,
-          selected: '# Does not parse the /n currently.',
+          selected: '# Does not parse the %br currently.',
           wrap: false,
         });
 
diff --git a/spec/frontend/vue_shared/components/markdown/field_spec.js b/spec/frontend/vue_shared/components/markdown/field_spec.js
index a01539820f5..76e1a1162ad 100644
--- a/spec/frontend/vue_shared/components/markdown/field_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/field_spec.js
@@ -250,7 +250,7 @@ describe('Markdown field component', () => {
       createSubject([{ rich_text: 'hello world\\n' }]);
 
       expect(subject.find('[data-testid="markdownHeader"]').props('lineContent')).toBe(
-        'hello world/n',
+        'hello world%br',
       );
     });
   });