Merge branch '6553-extract-ee-mock-data' into 'master'

Resolve "Extract EE specific files/lines for spec/javascripts/vue_mr_widget/mock_data.js"

Closes #6553

See merge request gitlab-org/gitlab-ee!11847

ee/changelogs/unreleased/6553-extract-ee-mock-data.yml

+---
+title: Extracted EE specific lines for spec/javascripts/vue_mr_widget/mock_data.js
+merge_request: 11847
+author:
+type: other

ee/spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js

@@ -13,7 +13,7 @@ import mockData, {
   headIssues,
   basePerformance,
   headPerformance,
-} from 'spec/vue_mr_widget/mock_data';
+} from 'ee_spec/vue_mr_widget/mock_data';
 
 import {
   sastIssues,

ee/spec/javascripts/vue_mr_widget/mock_data.js

+import mockData, { mockStore } from 'spec/vue_mr_widget/mock_data';
+
+export default Object.assign({}, mockData, {
+  codeclimate: {
+    head_path: 'head.json',
+    base_path: 'base.json',
+  },
+  blob_path: {
+    base_path: 'blob_path',
+    head_path: 'blob_path',
+  },
+  vulnerability_feedback_help_path:
+    '/help/user/project/merge_requests/index#interacting-with-security-reports-ultimate',
+});
+
+// Codeclimate
+export const headIssues = [
+  {
+    check_name: 'Rubocop/Lint/UselessAssignment',
+    description: 'Insecure Dependency',
+    location: {
+      path: 'lib/six.rb',
+      lines: {
+        begin: 6,
+        end: 7,
+      },
+    },
+    fingerprint: 'e879dd9bbc0953cad5037cde7ff0f627',
+  },
+  {
+    categories: ['Security'],
+    check_name: 'Insecure Dependency',
+    description: 'Insecure Dependency',
+    location: {
+      path: 'Gemfile.lock',
+      lines: {
+        begin: 22,
+        end: 22,
+      },
+    },
+    fingerprint: 'ca2e59451e98ae60ba2f54e3857c50e5',
+  },
+];
+// Codeclimate
+export const parsedHeadIssues = [
+  {
+    check_name: 'Rubocop/Lint/UselessAssignment',
+    description: 'Insecure Dependency',
+    location: {
+      path: 'lib/six.rb',
+      lines: {
+        begin: 6,
+        end: 7,
+      },
+    },
+    fingerprint: 'e879dd9bbc0953cad5037cde7ff0f627',
+    name: 'Insecure Dependency',
+    path: 'lib/six.rb',
+    urlPath: 'headPath/lib/six.rb#L6',
+    line: 6,
+  },
+];
+
+export const baseIssues = [
+  {
+    categories: ['Security'],
+    check_name: 'Insecure Dependency',
+    description: 'Insecure Dependency',
+    location: {
+      path: 'Gemfile.lock',
+      lines: {
+        begin: 22,
+        end: 22,
+      },
+    },
+    fingerprint: 'ca2e59451e98ae60ba2f54e3857c50e5',
+  },
+  {
+    categories: ['Security'],
+    check_name: 'Insecure Dependency',
+    description: 'Insecure Dependency',
+    location: {
+      path: 'Gemfile.lock',
+      lines: {
+        begin: 21,
+        end: 21,
+      },
+    },
+    fingerprint: 'ca2354534dee94ae60ba2f54e3857c50e5',
+  },
+];
+
+export const parsedBaseIssues = [
+  {
+    categories: ['Security'],
+    check_name: 'Insecure Dependency',
+    description: 'Insecure Dependency',
+    location: {
+      path: 'Gemfile.lock',
+      lines: {
+        begin: 21,
+        end: 21,
+      },
+    },
+    fingerprint: 'ca2354534dee94ae60ba2f54e3857c50e5',
+    name: 'Insecure Dependency',
+    path: 'Gemfile.lock',
+    line: 21,
+    urlPath: 'basePath/Gemfile.lock#L21',
+  },
+];
+
+export const headPerformance = [
+  {
+    subject: '/some/path',
+    metrics: [
+      {
+        name: 'Sitespeed Score',
+        value: 85,
+      },
+    ],
+  },
+  {
+    subject: '/some/other/path',
+    metrics: [
+      {
+        name: 'Sitespeed Score',
+        value: 79,
+        desiredSize: 'larger',
+      },
+      {
+        name: 'Requests',
+        value: 3,
+        desiredSize: 'smaller',
+      },
+    ],
+  },
+  {
+    subject: '/yet/another/path',
+    metrics: [
+      {
+        name: 'Sitespeed Score',
+        value: 80,
+      },
+    ],
+  },
+];
+
+export const basePerformance = [
+  {
+    subject: '/some/path',
+    metrics: [
+      {
+        name: 'Sitespeed Score',
+        value: 84,
+      },
+    ],
+  },
+  {
+    subject: '/some/other/path',
+    metrics: [
+      {
+        name: 'Sitespeed Score',
+        value: 80,
+        desiredSize: 'larger',
+      },
+      {
+        name: 'Requests',
+        value: 4,
+        desiredSize: 'smaller',
+      },
+    ],
+  },
+];
+
+export const codequalityParsedIssues = [
+  {
+    name: 'Insecure Dependency',
+    fingerprint: 'ca2e59451e98ae60ba2f54e3857c50e5',
+    path: 'Gemfile.lock',
+    line: 12,
+    urlPath: 'foo/Gemfile.lock',
+  },
+];
+
+export { mockStore };

ee/spec/javascripts/vue_mr_widget/mr_widget_pipeline_spec.js

 import Vue from 'vue';
 import pipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue';
 import mountComponent from 'spec/helpers/vue_mount_component_helper';
-import mockData from 'spec/vue_mr_widget/mock_data';
+import mockData from 'ee_spec/vue_mr_widget/mock_data';
 import mockLinkedPipelines from 'ee_spec/pipelines/graph/linked_pipelines_mock_data';
 
 describe('MRWidgetPipeline', () => {

ee/spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

+import MergeRequestStore from 'ee/vue_merge_request_widget/stores/mr_widget_store';
+import { stateKey } from '~/vue_merge_request_widget/stores/state_maps';
+import mockData, {
+  headIssues,
+  baseIssues,
+  parsedBaseIssues,
+  parsedHeadIssues,
+} from 'ee_spec/vue_mr_widget/mock_data';
+
+describe('MergeRequestStore', () => {
+  let store;
+
+  beforeEach(() => {
+    store = new MergeRequestStore(mockData);
+  });
+
+  describe('compareCodeclimateMetrics', () => {
+    beforeEach(() => {
+      store.compareCodeclimateMetrics(headIssues, baseIssues, 'headPath', 'basePath');
+    });
+
+    it('should return the new issues', () => {
+      expect(store.codeclimateMetrics.newIssues[0]).toEqual(parsedHeadIssues[0]);
+    });
+
+    it('should return the resolved issues', () => {
+      expect(store.codeclimateMetrics.resolvedIssues[0]).toEqual(parsedBaseIssues[0]);
+    });
+  });
+
+  describe('parseCodeclimateMetrics', () => {
+    it('should parse the received issues', () => {
+      const codequality = MergeRequestStore.parseCodeclimateMetrics(baseIssues, 'path')[0];
+
+      expect(codequality.name).toEqual(baseIssues[0].check_name);
+      expect(codequality.path).toEqual(baseIssues[0].location.path);
+      expect(codequality.line).toEqual(baseIssues[0].location.lines.begin);
+    });
+  });
+
+  describe('isNothingToMergeState', () => {
+    it('returns true when nothingToMerge', () => {
+      store.state = stateKey.nothingToMerge;
+
+      expect(store.isNothingToMergeState).toEqual(true);
+    });
+
+    it('returns false when not nothingToMerge', () => {
+      store.state = 'state';
+
+      expect(store.isNothingToMergeState).toEqual(false);
+    });
+  });
+});

ee/spec/javascripts/vue_shared/components/reports/report_issues_spec.js

@@ -4,7 +4,7 @@ import { STATUS_FAILED, STATUS_SUCCESS } from '~/reports/constants';
 import { componentNames } from 'ee/vue_shared/components/reports/issue_body';
 import store from 'ee/vue_shared/security_reports/store';
 import mountComponent, { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
-import { codequalityParsedIssues } from 'spec/vue_mr_widget/mock_data';
+import { codequalityParsedIssues } from 'ee_spec/vue_mr_widget/mock_data';
 import {
   sastParsedIssues,
   dockerReportParsed,

ee/spec/javascripts/vue_shared/components/reports/report_item_spec.js

@@ -4,7 +4,7 @@ import { STATUS_FAILED, STATUS_SUCCESS } from '~/reports/constants';
 import { componentNames } from 'ee/vue_shared/components/reports/issue_body';
 import store from 'ee/vue_shared/security_reports/store';
 import mountComponent, { mountComponentWithStore } from 'spec/helpers/vue_mount_component_helper';
-import { codequalityParsedIssues } from 'spec/vue_mr_widget/mock_data';
+import { codequalityParsedIssues } from 'ee_spec/vue_mr_widget/mock_data';
 import {
   sastParsedIssues,
   dockerReportParsed,

spec/javascripts/vue_mr_widget/mock_data.js

@@ -230,191 +230,12 @@ export default {
   diverged_commits_count: 0,
   only_allow_merge_if_pipeline_succeeds: false,
   commit_change_content_path: '/root/acets-app/merge_requests/22/commit_change_content',
-  codeclimate: {
-    head_path: 'head.json',
-    base_path: 'base.json',
-  },
-  blob_path: {
-    base_path: 'blob_path',
-    head_path: 'blob_path',
-  },
-  vulnerability_feedback_help_path:
-    '/help/user/project/merge_requests/index#interacting-with-security-reports-ultimate',
   merge_commit_path:
     'http://localhost:3000/root/acets-app/commit/53027d060246c8f47e4a9310fb332aa52f221775',
   troubleshooting_docs_path: 'help',
   merge_request_pipelines_docs_path: '/help/ci/merge_request_pipelines/index.md',
   squash: true,
 };
-// Codeclimate
-export const headIssues = [
-  {
-    check_name: 'Rubocop/Lint/UselessAssignment',
-    description: 'Insecure Dependency',
-    location: {
-      path: 'lib/six.rb',
-      lines: {
-        begin: 6,
-        end: 7,
-      },
-    },
-    fingerprint: 'e879dd9bbc0953cad5037cde7ff0f627',
-  },
-  {
-    categories: ['Security'],
-    check_name: 'Insecure Dependency',
-    description: 'Insecure Dependency',
-    location: {
-      path: 'Gemfile.lock',
-      lines: {
-        begin: 22,
-        end: 22,
-      },
-    },
-    fingerprint: 'ca2e59451e98ae60ba2f54e3857c50e5',
-  },
-];
-// Codeclimate
-export const parsedHeadIssues = [
-  {
-    check_name: 'Rubocop/Lint/UselessAssignment',
-    description: 'Insecure Dependency',
-    location: {
-      path: 'lib/six.rb',
-      lines: {
-        begin: 6,
-        end: 7,
-      },
-    },
-    fingerprint: 'e879dd9bbc0953cad5037cde7ff0f627',
-    name: 'Insecure Dependency',
-    path: 'lib/six.rb',
-    urlPath: 'headPath/lib/six.rb#L6',
-    line: 6,
-  },
-];
-
-export const baseIssues = [
-  {
-    categories: ['Security'],
-    check_name: 'Insecure Dependency',
-    description: 'Insecure Dependency',
-    location: {
-      path: 'Gemfile.lock',
-      lines: {
-        begin: 22,
-        end: 22,
-      },
-    },
-    fingerprint: 'ca2e59451e98ae60ba2f54e3857c50e5',
-  },
-  {
-    categories: ['Security'],
-    check_name: 'Insecure Dependency',
-    description: 'Insecure Dependency',
-    location: {
-      path: 'Gemfile.lock',
-      lines: {
-        begin: 21,
-        end: 21,
-      },
-    },
-    fingerprint: 'ca2354534dee94ae60ba2f54e3857c50e5',
-  },
-];
-
-export const parsedBaseIssues = [
-  {
-    categories: ['Security'],
-    check_name: 'Insecure Dependency',
-    description: 'Insecure Dependency',
-    location: {
-      path: 'Gemfile.lock',
-      lines: {
-        begin: 21,
-        end: 21,
-      },
-    },
-    fingerprint: 'ca2354534dee94ae60ba2f54e3857c50e5',
-    name: 'Insecure Dependency',
-    path: 'Gemfile.lock',
-    line: 21,
-    urlPath: 'basePath/Gemfile.lock#L21',
-  },
-];
-
-export const headPerformance = [
-  {
-    subject: '/some/path',
-    metrics: [
-      {
-        name: 'Sitespeed Score',
-        value: 85,
-      },
-    ],
-  },
-  {
-    subject: '/some/other/path',
-    metrics: [
-      {
-        name: 'Sitespeed Score',
-        value: 79,
-        desiredSize: 'larger',
-      },
-      {
-        name: 'Requests',
-        value: 3,
-        desiredSize: 'smaller',
-      },
-    ],
-  },
-  {
-    subject: '/yet/another/path',
-    metrics: [
-      {
-        name: 'Sitespeed Score',
-        value: 80,
-      },
-    ],
-  },
-];
-
-export const basePerformance = [
-  {
-    subject: '/some/path',
-    metrics: [
-      {
-        name: 'Sitespeed Score',
-        value: 84,
-      },
-    ],
-  },
-  {
-    subject: '/some/other/path',
-    metrics: [
-      {
-        name: 'Sitespeed Score',
-        value: 80,
-        desiredSize: 'larger',
-      },
-      {
-        name: 'Requests',
-        value: 4,
-        desiredSize: 'smaller',
-      },
-    ],
-  },
-];
-
-export const codequalityParsedIssues = [
-  {
-    name: 'Insecure Dependency',
-    fingerprint: 'ca2e59451e98ae60ba2f54e3857c50e5',
-    path: 'Gemfile.lock',
-    line: 12,
-    urlPath: 'foo/Gemfile.lock',
-  },
-];
 
 export const mockStore = {
   pipeline: { id: 0 },

spec/javascripts/vue_mr_widget/stores/mr_widget_store_spec.js

-import MergeRequestStore from 'ee/vue_merge_request_widget/stores/mr_widget_store';
+import MergeRequestStore from '~/vue_merge_request_widget/stores/mr_widget_store';
 import { stateKey } from '~/vue_merge_request_widget/stores/state_maps';
-import mockData, { headIssues, baseIssues, parsedBaseIssues, parsedHeadIssues } from '../mock_data';
+import mockData from '../mock_data';
 
 describe('MergeRequestStore', () => {
   let store;
@@ -83,42 +83,4 @@ describe('MergeRequestStore', () => {
       });
     });
   });
-
-  describe('compareCodeclimateMetrics', () => {
-    beforeEach(() => {
-      store.compareCodeclimateMetrics(headIssues, baseIssues, 'headPath', 'basePath');
-    });
-
-    it('should return the new issues', () => {
-      expect(store.codeclimateMetrics.newIssues[0]).toEqual(parsedHeadIssues[0]);
-    });
-
-    it('should return the resolved issues', () => {
-      expect(store.codeclimateMetrics.resolvedIssues[0]).toEqual(parsedBaseIssues[0]);
-    });
-  });
-
-  describe('parseCodeclimateMetrics', () => {
-    it('should parse the received issues', () => {
-      const codequality = MergeRequestStore.parseCodeclimateMetrics(baseIssues, 'path')[0];
-
-      expect(codequality.name).toEqual(baseIssues[0].check_name);
-      expect(codequality.path).toEqual(baseIssues[0].location.path);
-      expect(codequality.line).toEqual(baseIssues[0].location.lines.begin);
-    });
-  });
-
-  describe('isNothingToMergeState', () => {
-    it('returns true when nothingToMerge', () => {
-      store.state = stateKey.nothingToMerge;
-
-      expect(store.isNothingToMergeState).toEqual(true);
-    });
-
-    it('returns false when not nothingToMerge', () => {
-      store.state = 'state';
-
-      expect(store.isNothingToMergeState).toEqual(false);
-    });
-  });
 });