Add latest changes from gitlab-org/gitlab@master

1 files changed, 66 insertions, 3 deletions

diff --git a/spec/frontend/pipelines/time_ago_spec.js b/spec/frontend/pipelines/time_ago_spec.js
index 93aeb049434..412fb085e0b 100644
--- a/spec/frontend/pipelines/time_ago_spec.js
+++ b/spec/frontend/pipelines/time_ago_spec.js
@@ -5,6 +5,41 @@ import TimeAgo from '~/pipelines/components/pipelines_list/time_ago.vue';
 describe('Timeago component', () => {
   let wrapper;
 
+  const mutlipleStages = {
+    manual_actions: [
+      {
+        name: 'deploy_job',
+        path: '/root/one-stage-manual/-/jobs/1930/play',
+        playable: true,
+        scheduled: false,
+      },
+    ],
+    stages: [
+      {
+        name: 'deploy',
+      },
+      {
+        name: 'qa',
+      },
+    ],
+  };
+
+  const singleStageManual = {
+    manual_actions: [
+      {
+        name: 'deploy_job',
+        path: '/root/one-stage-manual/-/jobs/1930/play',
+        playable: true,
+        scheduled: false,
+      },
+    ],
+    stages: [
+      {
+        name: 'deploy',
+      },
+    ],
+  };
+
   const createComponent = (props = {}) => {
     wrapper = shallowMount(TimeAgo, {
       propsData: {
@@ -30,6 +65,7 @@ describe('Timeago component', () => {
   const duration = () => wrapper.find('.duration');
   const finishedAt = () => wrapper.find('.finished-at');
   const findInProgress = () => wrapper.find('[data-testid="pipeline-in-progress"]');
+  const findSkipped = () => wrapper.find('[data-testid="pipeline-skipped"]');
 
   describe('with duration', () => {
     beforeEach(() => {
@@ -46,7 +82,7 @@ describe('Timeago component', () => {
 
   describe('without duration', () => {
     beforeEach(() => {
-      createComponent({ duration: 0, finished_at: '' });
+      createComponent({ ...singleStageManual, duration: 0, finished_at: '' });
     });
 
     it('should not render duration and timer svg', () => {
@@ -71,7 +107,7 @@ describe('Timeago component', () => {
 
   describe('without finishedTime', () => {
     beforeEach(() => {
-      createComponent({ duration: 0, finished_at: '' });
+      createComponent({ ...singleStageManual, duration: 0, finished_at: '' });
     });
 
     it('should not render time and calendar icon', () => {
@@ -89,9 +125,36 @@ describe('Timeago component', () => {
     `(
       'progress state shown: $shouldShow when pipeline duration is $durationTime and finished_at is $finishedAtTime',
       ({ durationTime, finishedAtTime, shouldShow }) => {
-        createComponent({ duration: durationTime, finished_at: finishedAtTime });
+        createComponent({
+          ...mutlipleStages,
+          duration: durationTime,
+          finished_at: finishedAtTime,
+        });
 
         expect(findInProgress().exists()).toBe(shouldShow);
+        expect(findSkipped().exists()).toBe(false);
+      },
+    );
+  });
+
+  describe('skipped', () => {
+    it.each`
+      durationTime | finishedAtTime                | shouldShow
+      ${10}        | ${'2017-04-26T12:40:23.277Z'} | ${false}
+      ${10}        | ${''}                         | ${false}
+      ${0}         | ${'2017-04-26T12:40:23.277Z'} | ${false}
+      ${0}         | ${''}                         | ${true}
+    `(
+      'progress state shown: $shouldShow when pipeline duration is $durationTime and finished_at is $finishedAtTime',
+      ({ durationTime, finishedAtTime, shouldShow }) => {
+        createComponent({
+          ...singleStageManual,
+          duration: durationTime,
+          finished_at: finishedAtTime,
+        });
+
+        expect(findSkipped().exists()).toBe(shouldShow);
+        expect(findInProgress().exists()).toBe(false);
       },
     );
   });