Add latest changes from gitlab-org/gitlab@master

4 files changed, 49 insertions, 0 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 cfd493663b7..266782a7478 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
@@ -2,6 +2,7 @@ import packageJsonLinker from '~/vue_shared/components/source_viewer/plugins/uti
 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 gemfileLinker from '~/vue_shared/components/source_viewer/plugins/utils/gemfile_linker';
+import podspecJsonLinker from '~/vue_shared/components/source_viewer/plugins/utils/podspec_json_linker';
 import linkDependencies from '~/vue_shared/components/source_viewer/plugins/link_dependencies';
 import {
   PACKAGE_JSON_FILE_TYPE,
@@ -9,12 +10,14 @@ import {
   GEMSPEC_FILE_TYPE,
   GODEPS_JSON_FILE_TYPE,
   GEMFILE_FILE_TYPE,
+  PODSPEC_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');
 jest.mock('~/vue_shared/components/source_viewer/plugins/utils/gemfile_linker');
+jest.mock('~/vue_shared/components/source_viewer/plugins/utils/podspec_json_linker');
 
 describe('Highlight.js plugin for linking dependencies', () => {
   const hljsResultMock = { value: 'test' };
@@ -38,4 +41,9 @@ describe('Highlight.js plugin for linking dependencies', () => {
     linkDependencies(hljsResultMock, GEMFILE_FILE_TYPE);
     expect(gemfileLinker).toHaveBeenCalled();
   });
+
+  it('calls podspecJsonLinker for podspec_json file types', () => {
+    linkDependencies(hljsResultMock, PODSPEC_JSON_FILE_TYPE);
+    expect(podspecJsonLinker).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 4f390cebd37..8f3ff9a15bb 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
@@ -6,3 +6,20 @@ export const GEMSPEC_FILE_TYPE = 'gemspec';
 export const GODEPS_JSON_FILE_TYPE = 'godeps_json';
 
 export const GEMFILE_FILE_TYPE = 'gemfile';
+
+export const PODSPEC_JSON_FILE_TYPE = 'podspec_json';
+
+export const PODSPEC_JSON_CONTENT = `{
+    "dependencies": {
+        "MyCheckCore": [
+        ]
+    },
+    "subspecs": [
+      {
+        "dependencies": {
+          "AFNetworking/Security": [
+          ]
+        }
+      }
+    ]
+  }`;
diff --git a/spec/frontend/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util_spec.js b/spec/frontend/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util_spec.js
index e1dbdf8a87d..66e2020da27 100644
--- a/spec/frontend/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util_spec.js
+++ b/spec/frontend/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util_spec.js
@@ -1,7 +1,9 @@
 import {
   createLink,
   generateHLJSOpenTag,
+  getObjectKeysByKeyName,
 } from '~/vue_shared/components/source_viewer/plugins/utils/dependency_linker_util';
+import { PODSPEC_JSON_CONTENT } from '../mock_data';
 
 describe('createLink', () => {
   it('generates a link with the correct attributes', () => {
@@ -32,3 +34,11 @@ describe('generateHLJSOpenTag', () => {
     expect(generateHLJSOpenTag(type)).toBe(result);
   });
 });
+
+describe('getObjectKeysByKeyName method', () => {
+  it('gets all object keys within specified key', () => {
+    const acc = [];
+    const keys = getObjectKeysByKeyName(JSON.parse(PODSPEC_JSON_CONTENT), 'dependencies', acc);
+    expect(keys).toEqual(['MyCheckCore', 'AFNetworking/Security']);
+  });
+});
diff --git a/spec/frontend/vue_shared/components/source_viewer/plugins/utils/podspec_json_linker_spec.js b/spec/frontend/vue_shared/components/source_viewer/plugins/utils/podspec_json_linker_spec.js
new file mode 100644
index 00000000000..0ef63de68c6
--- /dev/null
+++ b/spec/frontend/vue_shared/components/source_viewer/plugins/utils/podspec_json_linker_spec.js
@@ -0,0 +1,14 @@
+import podspecJsonLinker from '~/vue_shared/components/source_viewer/plugins/utils/podspec_json_linker';
+import { PODSPEC_JSON_CONTENT } from '../mock_data';
+
+describe('Highlight.js plugin for linking podspec_json dependencies', () => {
+  it('mutates the input value by wrapping dependency names in anchors', () => {
+    const inputValue =
+      '<span class="hljs-attr">&quot;AFNetworking/Security&quot;</span><span class="hljs-punctuation">:</span><span class=""> </span><span class="hljs-punctuation">[';
+    const outputValue =
+      '<span class="hljs-attr">&quot;<a href="https://cocoapods.org/pods/AFNetworking" target="_blank" rel="nofollow noreferrer noopener">AFNetworking/Security</a>&quot;</span><span class="hljs-punctuation">:</span><span class=""> </span><span class="hljs-punctuation">[';
+    const hljsResultMock = { value: inputValue };
+    const output = podspecJsonLinker(hljsResultMock, PODSPEC_JSON_CONTENT);
+    expect(output).toBe(outputValue);
+  });
+});