Add latest changes from gitlab-org/gitlab@master

3 files changed, 234 insertions, 2 deletions

diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
index bdc38eb0b22..7a92484695c 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js
@@ -224,8 +224,8 @@ describe('MRWidgetConflicts', () => {
           });
         });
 
-        it('should not allow you to resolve the conflicts', () => {
-          expect(findResolveButton().exists()).toBe(false);
+        it('should allow you to resolve the conflicts', () => {
+          expect(findResolveButton().exists()).toBe(true);
         });
       });
 
diff --git a/spec/frontend/vue_mr_widget/extentions/code_quality/index_spec.js b/spec/frontend/vue_mr_widget/extentions/code_quality/index_spec.js
new file mode 100644
index 00000000000..9a72e4a086b
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/extentions/code_quality/index_spec.js
@@ -0,0 +1,145 @@
+import MockAdapter from 'axios-mock-adapter';
+import { mountExtended } from 'helpers/vue_test_utils_helper';
+import { trimText } from 'helpers/text_helper';
+import waitForPromises from 'helpers/wait_for_promises';
+import axios from '~/lib/utils/axios_utils';
+import extensionsContainer from '~/vue_merge_request_widget/components/extensions/container';
+import { registerExtension } from '~/vue_merge_request_widget/components/extensions';
+import codeQualityExtension from '~/vue_merge_request_widget/extensions/code_quality';
+import httpStatusCodes from '~/lib/utils/http_status';
+import {
+  codeQualityResponseNewErrors,
+  codeQualityResponseResolvedErrors,
+  codeQualityResponseResolvedAndNewErrors,
+  codeQualityResponseNoErrors,
+} from './mock_data';
+
+describe('Code Quality extension', () => {
+  let wrapper;
+  let mock;
+
+  registerExtension(codeQualityExtension);
+
+  const endpoint = '/root/repo/-/merge_requests/4/accessibility_reports.json';
+
+  const mockApi = (statusCode, data) => {
+    mock.onGet(endpoint).reply(statusCode, data);
+  };
+
+  const findToggleCollapsedButton = () => wrapper.findByTestId('toggle-button');
+  const findAllExtensionListItems = () => wrapper.findAllByTestId('extension-list-item');
+
+  const createComponent = () => {
+    wrapper = mountExtended(extensionsContainer, {
+      propsData: {
+        mr: {
+          codeQuality: endpoint,
+          blobPath: {
+            head_path: 'example/path',
+            base_path: 'example/path',
+          },
+        },
+      },
+    });
+  };
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    mock.restore();
+  });
+
+  describe('summary', () => {
+    it('displays loading text', () => {
+      mockApi(httpStatusCodes.OK, codeQualityResponseNewErrors);
+
+      createComponent();
+
+      expect(wrapper.text()).toBe('Code Quality test metrics results are being parsed');
+    });
+
+    it('displays failed loading text', async () => {
+      mockApi(httpStatusCodes.INTERNAL_SERVER_ERROR);
+
+      createComponent();
+
+      await waitForPromises();
+      expect(wrapper.text()).toBe('Code Quality failed loading results');
+    });
+
+    it('displays quality degradation', async () => {
+      mockApi(httpStatusCodes.OK, codeQualityResponseNewErrors);
+
+      createComponent();
+
+      await waitForPromises();
+
+      expect(wrapper.text()).toBe('Code Quality degraded on 2 points.');
+    });
+
+    it('displays quality improvement', async () => {
+      mockApi(httpStatusCodes.OK, codeQualityResponseResolvedErrors);
+
+      createComponent();
+
+      await waitForPromises();
+
+      expect(wrapper.text()).toBe('Code Quality improved on 2 points.');
+    });
+
+    it('displays quality improvement and degradation', async () => {
+      mockApi(httpStatusCodes.OK, codeQualityResponseResolvedAndNewErrors);
+
+      createComponent();
+
+      await waitForPromises();
+
+      expect(wrapper.text()).toBe('Code Quality improved on 1 point and degraded on 1 point.');
+    });
+
+    it('displays no detected errors', async () => {
+      mockApi(httpStatusCodes.OK, codeQualityResponseNoErrors);
+
+      createComponent();
+
+      await waitForPromises();
+
+      expect(wrapper.text()).toBe('No changes to Code Quality.');
+    });
+  });
+
+  describe('expanded data', () => {
+    beforeEach(async () => {
+      mockApi(httpStatusCodes.OK, codeQualityResponseResolvedAndNewErrors);
+
+      createComponent();
+
+      await waitForPromises();
+
+      findToggleCollapsedButton().trigger('click');
+
+      await waitForPromises();
+    });
+
+    it('displays all report list items in viewport', async () => {
+      expect(findAllExtensionListItems()).toHaveLength(2);
+    });
+
+    it('displays report list item formatted', () => {
+      const text = {
+        newError: trimText(findAllExtensionListItems().at(0).text().replace(/\s+/g, ' ').trim()),
+        resolvedError: findAllExtensionListItems().at(1).text().replace(/\s+/g, ' ').trim(),
+      };
+
+      expect(text.newError).toContain(
+        "Minor - Parsing error: 'return' outside of function in index.js:12",
+      );
+      expect(text.resolvedError).toContain(
+        "Minor - Parsing error: 'return' outside of function in index.js:12",
+      );
+    });
+  });
+});
diff --git a/spec/frontend/vue_mr_widget/extentions/code_quality/mock_data.js b/spec/frontend/vue_mr_widget/extentions/code_quality/mock_data.js
new file mode 100644
index 00000000000..f5ad0ce7377
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/extentions/code_quality/mock_data.js
@@ -0,0 +1,87 @@
+export const codeQualityResponseNewErrors = {
+  status: 'failed',
+  new_errors: [
+    {
+      description: "Parsing error: 'return' outside of function",
+      severity: 'minor',
+      file_path: 'index.js',
+      line: 12,
+    },
+    {
+      description: 'TODO found',
+      severity: 'minor',
+      file_path: '.gitlab-ci.yml',
+      line: 73,
+    },
+  ],
+  resolved_errors: [],
+  existing_errors: [],
+  summary: {
+    total: 2,
+    resolved: 0,
+    errored: 2,
+  },
+};
+
+export const codeQualityResponseResolvedErrors = {
+  status: 'failed',
+  new_errors: [],
+  resolved_errors: [
+    {
+      description: "Parsing error: 'return' outside of function",
+      severity: 'minor',
+      file_path: 'index.js',
+      line: 12,
+    },
+    {
+      description: 'TODO found',
+      severity: 'minor',
+      file_path: '.gitlab-ci.yml',
+      line: 73,
+    },
+  ],
+  existing_errors: [],
+  summary: {
+    total: 2,
+    resolved: 2,
+    errored: 0,
+  },
+};
+
+export const codeQualityResponseResolvedAndNewErrors = {
+  status: 'failed',
+  new_errors: [
+    {
+      description: "Parsing error: 'return' outside of function",
+      severity: 'minor',
+      file_path: 'index.js',
+      line: 12,
+    },
+  ],
+  resolved_errors: [
+    {
+      description: "Parsing error: 'return' outside of function",
+      severity: 'minor',
+      file_path: 'index.js',
+      line: 12,
+    },
+  ],
+  existing_errors: [],
+  summary: {
+    total: 2,
+    resolved: 1,
+    errored: 1,
+  },
+};
+
+export const codeQualityResponseNoErrors = {
+  status: 'failed',
+  new_errors: [],
+  resolved_errors: [],
+  existing_errors: [],
+  summary: {
+    total: 0,
+    resolved: 0,
+    errored: 0,
+  },
+};