Merge branch '11-6-stable-patch-5' into '11-6-stable'

Prepare 11.6.5 release

See merge request gitlab-org/gitlab-ce!24439

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js b/spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js
index d4ed8f2f7a4..f87c2a92f47 100644
--- a/spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js
+++ b/spec/javascripts/vue_shared/components/markdown/suggestion_diff_spec.js
@@ -34,8 +34,8 @@ describe('Suggestion Diff component', () => {
       expect(vm.$el.querySelector('.qa-suggestion-diff-header')).not.toBeNull();
     });
 
-    it('renders a diff table', () => {
-      expect(vm.$el.querySelector('table.md-suggestion-diff')).not.toBeNull();
+    it('renders a diff table with syntax highlighting', () => {
+      expect(vm.$el.querySelector('.md-suggestion-diff.js-syntax-highlight.code')).not.toBeNull();
     });
 
     it('renders the oldLineNumber', () => {
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);