Add latest changes from gitlab-org/gitlab@14-8-stable-ee

3 files changed, 10 insertions, 209 deletions

diff --git a/spec/frontend/pipelines/mock_data.js b/spec/frontend/pipelines/mock_data.js
index 8cb6cf3bed6..59d4e808b32 100644
--- a/spec/frontend/pipelines/mock_data.js
+++ b/spec/frontend/pipelines/mock_data.js
@@ -676,7 +676,7 @@ export const mockPipeline = (projectPath) => {
         short_id: 'fd6df5b3',
         created_at: '2021-10-19T21:17:12.000+00:00',
         parent_ids: ['7147906b84306e83cb3fec6582a25390b75713c6'],
-        title: 'Commit Title',
+        title: 'Commit',
         message: 'Commit',
         author_name: 'Administrator',
         author_email: 'admin@example.com',
@@ -1141,176 +1141,3 @@ export const mockPipelineBranch = () => {
     viewType: 'root',
   };
 };
-
-export const mockPipelineNoCommit = () => {
-  return {
-    pipeline: {
-      id: 268,
-      iid: 34,
-      user: {
-        id: 1,
-        username: 'root',
-        name: 'Administrator',
-        state: 'active',
-        avatar_url:
-          'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
-        web_url: 'http://gdk.test:3000/root',
-        show_status: false,
-        path: '/root',
-      },
-      active: false,
-      source: 'push',
-      created_at: '2022-01-14T17:40:27.866Z',
-      updated_at: '2022-01-14T18:02:35.850Z',
-      path: '/root/mr-widgets/-/pipelines/268',
-      flags: {
-        stuck: false,
-        auto_devops: false,
-        merge_request: false,
-        yaml_errors: false,
-        retryable: true,
-        cancelable: false,
-        failure_reason: false,
-        detached_merge_request_pipeline: false,
-        merge_request_pipeline: false,
-        merge_train_pipeline: false,
-        latest: true,
-      },
-      details: {
-        status: {
-          icon: 'status_warning',
-          text: 'passed',
-          label: 'passed with warnings',
-          group: 'success-with-warnings',
-          tooltip: 'passed',
-          has_details: true,
-          details_path: '/root/mr-widgets/-/pipelines/268',
-          illustration: null,
-          favicon:
-            '/assets/ci_favicons/favicon_status_success-8451333011eee8ce9f2ab25dc487fe24a8758c694827a582f17f42b0a90446a2.png',
-        },
-        stages: [
-          {
-            name: 'validate',
-            title: 'validate: passed with warnings',
-            status: {
-              icon: 'status_warning',
-              text: 'passed',
-              label: 'passed with warnings',
-              group: 'success-with-warnings',
-              tooltip: 'passed',
-              has_details: true,
-              details_path: '/root/mr-widgets/-/pipelines/268#validate',
-              illustration: null,
-              favicon:
-                '/assets/ci_favicons/favicon_status_success-8451333011eee8ce9f2ab25dc487fe24a8758c694827a582f17f42b0a90446a2.png',
-            },
-            path: '/root/mr-widgets/-/pipelines/268#validate',
-            dropdown_path: '/root/mr-widgets/-/pipelines/268/stage.json?stage=validate',
-          },
-          {
-            name: 'test',
-            title: 'test: passed',
-            status: {
-              icon: 'status_success',
-              text: 'passed',
-              label: 'passed',
-              group: 'success',
-              tooltip: 'passed',
-              has_details: true,
-              details_path: '/root/mr-widgets/-/pipelines/268#test',
-              illustration: null,
-              favicon:
-                '/assets/ci_favicons/favicon_status_success-8451333011eee8ce9f2ab25dc487fe24a8758c694827a582f17f42b0a90446a2.png',
-            },
-            path: '/root/mr-widgets/-/pipelines/268#test',
-            dropdown_path: '/root/mr-widgets/-/pipelines/268/stage.json?stage=test',
-          },
-          {
-            name: 'build',
-            title: 'build: passed',
-            status: {
-              icon: 'status_success',
-              text: 'passed',
-              label: 'passed',
-              group: 'success',
-              tooltip: 'passed',
-              has_details: true,
-              details_path: '/root/mr-widgets/-/pipelines/268#build',
-              illustration: null,
-              favicon:
-                '/assets/ci_favicons/favicon_status_success-8451333011eee8ce9f2ab25dc487fe24a8758c694827a582f17f42b0a90446a2.png',
-            },
-            path: '/root/mr-widgets/-/pipelines/268#build',
-            dropdown_path: '/root/mr-widgets/-/pipelines/268/stage.json?stage=build',
-          },
-        ],
-        duration: 75,
-        finished_at: '2022-01-14T18:02:35.842Z',
-        name: 'Pipeline',
-        manual_actions: [],
-        scheduled_actions: [],
-      },
-      ref: {
-        name: 'update-ci',
-        path: '/root/mr-widgets/-/commits/update-ci',
-        tag: false,
-        branch: true,
-        merge_request: false,
-      },
-      retry_path: '/root/mr-widgets/-/pipelines/268/retry',
-      delete_path: '/root/mr-widgets/-/pipelines/268',
-      failed_builds: [
-        {
-          id: 1260,
-          name: 'fmt',
-          started: '2022-01-14T17:40:36.435Z',
-          complete: true,
-          archived: false,
-          build_path: '/root/mr-widgets/-/jobs/1260',
-          retry_path: '/root/mr-widgets/-/jobs/1260/retry',
-          playable: false,
-          scheduled: false,
-          created_at: '2022-01-14T17:40:27.879Z',
-          updated_at: '2022-01-14T17:40:42.129Z',
-          status: {
-            icon: 'status_warning',
-            text: 'failed',
-            label: 'failed (allowed to fail)',
-            group: 'failed-with-warnings',
-            tooltip: 'failed - (script failure) (allowed to fail)',
-            has_details: true,
-            details_path: '/root/mr-widgets/-/jobs/1260',
-            illustration: {
-              image:
-                '/assets/illustrations/skipped-job_empty-29a8a37d8a61d1b6f68cf3484f9024e53cd6eb95e28eae3554f8011a1146bf27.svg',
-              size: 'svg-430',
-              title: 'This job does not have a trace.',
-            },
-            favicon:
-              '/assets/ci_favicons/favicon_status_failed-41304d7f7e3828808b0c26771f0309e55296819a9beea3ea9fbf6689d9857c12.png',
-            action: {
-              icon: 'retry',
-              title: 'Retry',
-              path: '/root/mr-widgets/-/jobs/1260/retry',
-              method: 'post',
-              button_title: 'Retry this job',
-            },
-          },
-          recoverable: false,
-        },
-      ],
-      project: {
-        id: 23,
-        name: 'mr-widgets',
-        full_path: '/root/mr-widgets',
-        full_name: 'Administrator / mr-widgets',
-      },
-      triggered_by: null,
-      triggered: [],
-    },
-    pipelineScheduleUrl: 'foo',
-    pipelineKey: 'id',
-    viewType: 'root',
-  };
-};
diff --git a/spec/frontend/pipelines/pipeline_url_spec.js b/spec/frontend/pipelines/pipeline_url_spec.js
index b24e2e09ea8..2f083faaaa6 100644
--- a/spec/frontend/pipelines/pipeline_url_spec.js
+++ b/spec/frontend/pipelines/pipeline_url_spec.js
@@ -1,12 +1,7 @@
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { trimText } from 'helpers/text_helper';
 import PipelineUrlComponent from '~/pipelines/components/pipelines_list/pipeline_url.vue';
-import {
-  mockPipeline,
-  mockPipelineBranch,
-  mockPipelineTag,
-  mockPipelineNoCommit,
-} from './mock_data';
+import { mockPipeline, mockPipelineBranch, mockPipelineTag } from './mock_data';
 
 const projectPath = 'test/test';
 
@@ -31,7 +26,7 @@ describe('Pipeline Url Component', () => {
   const findCommitIconType = () => wrapper.findByTestId('commit-icon-type');
 
   const findCommitTitleContainer = () => wrapper.findByTestId('commit-title-container');
-  const findCommitTitle = () => wrapper.findByTestId('commit-title');
+  const findCommitTitle = (commitWrapper) => commitWrapper.find('[data-testid="commit-title"]');
 
   const defaultProps = mockPipeline(projectPath);
 
@@ -237,33 +232,5 @@ describe('Pipeline Url Component', () => {
         expect(findCommitIconType().attributes('title')).toBe(expectedTitle);
       },
     );
-
-    describe('with commit', () => {
-      beforeEach(() => {
-        createComponent({}, true);
-      });
-
-      it('displays commit title with link to pipeline', () => {
-        expect(findCommitTitle().attributes('href')).toBe(defaultProps.pipeline.path);
-      });
-
-      it('displays commit title text', () => {
-        expect(findCommitTitle().text()).toBe(defaultProps.pipeline.commit.title);
-      });
-    });
-
-    describe('without commit', () => {
-      beforeEach(() => {
-        createComponent(mockPipelineNoCommit(), true);
-      });
-
-      it('displays cant find head commit text', () => {
-        expect(findCommitTitle().text()).toBe("Can't find HEAD commit for this branch");
-      });
-
-      it('displays link to pipeline', () => {
-        expect(findCommitTitle().attributes('href')).toBe(mockPipelineNoCommit().pipeline.path);
-      });
-    });
   });
 });
diff --git a/spec/frontend/vue_shared/components/markdown/header_spec.js b/spec/frontend/vue_shared/components/markdown/header_spec.js
index 93ce3935fab..700ec75fcee 100644
--- a/spec/frontend/vue_shared/components/markdown/header_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/header_spec.js
@@ -20,6 +20,7 @@ describe('Markdown field header component', () => {
 
   const findWriteTab = () => wrapper.findByTestId('write-tab');
   const findPreviewTab = () => wrapper.findByTestId('preview-tab');
+  const findToolbar = () => wrapper.findByTestId('md-header-toolbar');
   const findToolbarButtons = () => wrapper.findAll(ToolbarButton);
   const findToolbarButtonByProp = (prop, value) =>
     findToolbarButtons()
@@ -90,6 +91,12 @@ describe('Markdown field header component', () => {
     expect(findPreviewTab().attributes('active')).toBe('true');
   });
 
+  it('hides toolbar in preview mode', () => {
+    createWrapper({ previewMarkdown: true });
+
+    expect(findToolbar().classes().includes('gl-display-none')).toBe(true);
+  });
+
   it('emits toggle markdown event when clicking preview tab', async () => {
     const eventData = { target: {} };
     findPreviewTab().vm.$emit('click', eventData);