Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 7 deletions

diff --git a/spec/frontend/vue_shared/components/source_viewer/source_viewer_spec.js b/spec/frontend/vue_shared/components/source_viewer/source_viewer_spec.js
index 2010bac7060..ab579945e22 100644
--- a/spec/frontend/vue_shared/components/source_viewer/source_viewer_spec.js
+++ b/spec/frontend/vue_shared/components/source_viewer/source_viewer_spec.js
@@ -7,6 +7,7 @@ import SourceViewer from '~/vue_shared/components/source_viewer/source_viewer.vu
 import { ROUGE_TO_HLJS_LANGUAGE_MAP } from '~/vue_shared/components/source_viewer/constants';
 import LineNumbers from '~/vue_shared/components/line_numbers.vue';
 import waitForPromises from 'helpers/wait_for_promises';
+import * as sourceViewerUtils from '~/vue_shared/components/source_viewer/utils';
 
 jest.mock('highlight.js/lib/core');
 Vue.use(VueRouter);
@@ -36,6 +37,7 @@ describe('Source Viewer component', () => {
   beforeEach(() => {
     hljs.highlight.mockImplementation(() => ({ value: highlightedContent }));
     hljs.highlightAuto.mockImplementation(() => ({ value: highlightedContent }));
+    jest.spyOn(sourceViewerUtils, 'wrapLines');
 
     return createComponent();
   });
@@ -73,6 +75,10 @@ describe('Source Viewer component', () => {
       expect(findLoadingIcon().exists()).toBe(true);
     });
 
+    it('calls the wrapLines helper method with highlightedContent and mappedLanguage', () => {
+      expect(sourceViewerUtils.wrapLines).toHaveBeenCalledWith(highlightedContent, mappedLanguage);
+    });
+
     it('renders Line Numbers', () => {
       expect(findLineNumbers().props('lines')).toBe(1);
     });
diff --git a/spec/frontend/vue_shared/components/source_viewer/utils_spec.js b/spec/frontend/vue_shared/components/source_viewer/utils_spec.js
index 937c3b26c67..0631e7efd54 100644
--- a/spec/frontend/vue_shared/components/source_viewer/utils_spec.js
+++ b/spec/frontend/vue_shared/components/source_viewer/utils_spec.js
@@ -2,12 +2,25 @@ import { wrapLines } from '~/vue_shared/components/source_viewer/utils';
 
 describe('Wrap lines', () => {
   it.each`
-    input                                              | output
-    ${'line 1'}                                        | ${'<span id="LC1" class="line">line 1</span>'}
-    ${'line 1\nline 2'}                                | ${`<span id="LC1" class="line">line 1</span>\n<span id="LC2" class="line">line 2</span>`}
-    ${'<span class="hljs-code">line 1\nline 2</span>'} | ${`<span id="LC1" class="hljs-code">line 1\n<span id="LC2" class="line">line 2</span></span>`}
-    ${'<span class="hljs-code">```bash'}               | ${'<span id="LC1" class="hljs-code">```bash'}
-  `('returns lines wrapped in spans containing line numbers', ({ input, output }) => {
-    expect(wrapLines(input)).toBe(output);
+    content                                            | language             | output
+    ${'line 1'}                                        | ${'javascript'}      | ${'<span id="LC1" lang="javascript" class="line">line 1</span>'}
+    ${'line 1\nline 2'}                                | ${'html'}            | ${`<span id="LC1" lang="html" class="line">line 1</span>\n<span id="LC2" lang="html" class="line">line 2</span>`}
+    ${'<span class="hljs-code">line 1\nline 2</span>'} | ${'html'}            | ${`<span id="LC1" lang="html" class="hljs-code">line 1\n<span id="LC2" lang="html" class="line">line 2</span></span>`}
+    ${'<span class="hljs-code">```bash'}               | ${'bash'}            | ${'<span id="LC1" lang="bash" class="hljs-code">```bash'}
+    ${'<span class="hljs-code">```bash'}               | ${'valid-language1'} | ${'<span id="LC1" lang="valid-language1" class="hljs-code">```bash'}
+    ${'<span class="hljs-code">```bash'}               | ${'valid_language2'} | ${'<span id="LC1" lang="valid_language2" class="hljs-code">```bash'}
+  `('returns lines wrapped in spans containing line numbers', ({ content, language, output }) => {
+    expect(wrapLines(content, language)).toBe(output);
+  });
+
+  it.each`
+    language
+    ${'invalidLanguage>'}
+    ${'"invalidLanguage"'}
+    ${'<invalidLanguage'}
+  `('returns lines safely without XSS language is not valid', ({ language }) => {
+    expect(wrapLines('<span class="hljs-code">```bash', language)).toBe(
+      '<span id="LC1" lang="" class="hljs-code">```bash',
+    );
   });
 });