Add latest changes from gitlab-org/gitlab@master

3 files changed, 42 insertions, 1 deletions

diff --git a/spec/frontend/vue_shared/components/source_viewer/plugins/link_dependencies_spec.js b/spec/frontend/vue_shared/components/source_viewer/plugins/link_dependencies_spec.js
index 375b1307616..032f2985d35 100644
--- a/spec/frontend/vue_shared/components/source_viewer/plugins/link_dependencies_spec.js
+++ b/spec/frontend/vue_shared/components/source_viewer/plugins/link_dependencies_spec.js
@@ -1,10 +1,17 @@
 import packageJsonLinker from '~/vue_shared/components/source_viewer/plugins/utils/package_json_linker';
+import godepsJsonLinker from '~/vue_shared/components/source_viewer/plugins/utils/godeps_json_linker';
 import gemspecLinker from '~/vue_shared/components/source_viewer/plugins/utils/gemspec_linker';
 import linkDependencies from '~/vue_shared/components/source_viewer/plugins/link_dependencies';
-import { PACKAGE_JSON_FILE_TYPE, PACKAGE_JSON_CONTENT, GEMSPEC_FILE_TYPE } from './mock_data';
+import {
+  PACKAGE_JSON_FILE_TYPE,
+  PACKAGE_JSON_CONTENT,
+  GEMSPEC_FILE_TYPE,
+  GODEPS_JSON_FILE_TYPE,
+} from './mock_data';
 
 jest.mock('~/vue_shared/components/source_viewer/plugins/utils/package_json_linker');
 jest.mock('~/vue_shared/components/source_viewer/plugins/utils/gemspec_linker');
+jest.mock('~/vue_shared/components/source_viewer/plugins/utils/godeps_json_linker');
 
 describe('Highlight.js plugin for linking dependencies', () => {
   const hljsResultMock = { value: 'test' };
@@ -18,4 +25,9 @@ describe('Highlight.js plugin for linking dependencies', () => {
     linkDependencies(hljsResultMock, GEMSPEC_FILE_TYPE);
     expect(gemspecLinker).toHaveBeenCalled();
   });
+
+  it('calls godepsJsonLinker for godeps_json file types', () => {
+    linkDependencies(hljsResultMock, GODEPS_JSON_FILE_TYPE);
+    expect(godepsJsonLinker).toHaveBeenCalled();
+  });
 });
diff --git a/spec/frontend/vue_shared/components/source_viewer/plugins/mock_data.js b/spec/frontend/vue_shared/components/source_viewer/plugins/mock_data.js
index aa874c9c081..3146600e491 100644
--- a/spec/frontend/vue_shared/components/source_viewer/plugins/mock_data.js
+++ b/spec/frontend/vue_shared/components/source_viewer/plugins/mock_data.js
@@ -2,3 +2,5 @@ export const PACKAGE_JSON_FILE_TYPE = 'package_json';
 export const PACKAGE_JSON_CONTENT = '{ "dependencies": { "@babel/core": "^7.18.5" } }';
 
 export const GEMSPEC_FILE_TYPE = 'gemspec';
+
+export const GODEPS_JSON_FILE_TYPE = 'godeps_json';
diff --git a/spec/frontend/vue_shared/components/source_viewer/plugins/utils/godeps_json_linker_spec.js b/spec/frontend/vue_shared/components/source_viewer/plugins/utils/godeps_json_linker_spec.js
new file mode 100644
index 00000000000..1d8b11cf707
--- /dev/null
+++ b/spec/frontend/vue_shared/components/source_viewer/plugins/utils/godeps_json_linker_spec.js
@@ -0,0 +1,27 @@
+import godepsJsonLinker from '~/vue_shared/components/source_viewer/plugins/utils/godeps_json_linker';
+
+const getInputValue = (dependencyString) =>
+  `<span class="hljs-attr">&quot;ImportPath&quot;</span><span class="hljs-punctuation">:</span><span class=""> </span><span class="hljs-string">&quot;${dependencyString}&quot;</span>`;
+const getOutputValue = (dependencyString, expectedHref) =>
+  `<span class="hljs-attr">&quot;ImportPath&quot;</span><span class="hljs-punctuation">:</span><span class=""> </span><span class="hljs-attr">&quot;<a href="${expectedHref}" rel="nofollow noreferrer noopener">${dependencyString}</a>&quot;</span>`;
+
+describe('Highlight.js plugin for linking Godeps.json dependencies', () => {
+  it.each`
+    dependency                                      | expectedHref
+    ${'gitlab.com/group/project/path'}              | ${'https://gitlab.com/group/project/_/tree/master/path'}
+    ${'gitlab.com/group/subgroup/project.git/path'} | ${'https://gitlab.com/group/subgroup/_/tree/master/project.git/path'}
+    ${'github.com/docker/docker/pkg/homedir'}       | ${'https://github.com/docker/docker/tree/master/pkg/homedir'}
+    ${'golang.org/x/net/http2'}                     | ${'https://godoc.org/golang.org/x/net/http2'}
+    ${'gopkg.in/yaml.v1'}                           | ${'https://gopkg.in/yaml.v1'}
+  `(
+    'mutates the input value by wrapping dependency names in anchors and altering path when needed',
+    ({ dependency, expectedHref }) => {
+      const inputValue = getInputValue(dependency);
+      const outputValue = getOutputValue(dependency, expectedHref);
+      const hljsResultMock = { value: inputValue };
+
+      const output = godepsJsonLinker(hljsResultMock);
+      expect(output).toBe(outputValue);
+    },
+  );
+});