Add latest changes from gitlab-org/gitlab@master

3 files changed, 67 insertions, 117 deletions

diff --git a/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js b/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js
index 6f28362e478..7bf955012c7 100644
--- a/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js
+++ b/spec/frontend/ci/pipeline_editor/components/header/pipeline_editor_mini_graph_spec.js
@@ -47,11 +47,6 @@ describe('Pipeline Status', () => {
     mockLinkedPipelinesQuery = jest.fn();
   });
 
-  afterEach(() => {
-    mockLinkedPipelinesQuery.mockReset();
-    wrapper.destroy();
-  });
-
   describe('when there are stages', () => {
     beforeEach(() => {
       createComponent();
@@ -74,9 +69,11 @@ describe('Pipeline Status', () => {
 
   describe('when querying upstream and downstream pipelines', () => {
     describe('when query succeeds', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         mockLinkedPipelinesQuery.mockResolvedValue(mockLinkedPipelines());
         createComponentWithApollo();
+
+        await waitForPromises();
       });
 
       it('should call the query with the correct variables', () => {
@@ -86,6 +83,10 @@ describe('Pipeline Status', () => {
           iid: mockProjectPipeline().pipeline.iid,
         });
       });
+
+      it('renders only the latest downstream pipelines', () => {
+        expect(findPipelineMiniGraph().props('downstreamPipelines')).toHaveLength(1);
+      });
     });
 
     describe('when query fails', () => {
diff --git a/spec/frontend/ci/pipeline_editor/components/header/pipline_editor_mini_graph_spec.js b/spec/frontend/ci/pipeline_editor/components/header/pipline_editor_mini_graph_spec.js
deleted file mode 100644
index 6f28362e478..00000000000
--- a/spec/frontend/ci/pipeline_editor/components/header/pipline_editor_mini_graph_spec.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import Vue from 'vue';
-import VueApollo from 'vue-apollo';
-import createMockApollo from 'helpers/mock_apollo_helper';
-import waitForPromises from 'helpers/wait_for_promises';
-import PipelineEditorMiniGraph from '~/ci/pipeline_editor/components/header/pipeline_editor_mini_graph.vue';
-import PipelineMiniGraph from '~/pipelines/components/pipeline_mini_graph/pipeline_mini_graph.vue';
-import getLinkedPipelinesQuery from '~/projects/commit_box/info/graphql/queries/get_linked_pipelines.query.graphql';
-import { PIPELINE_FAILURE } from '~/ci/pipeline_editor/constants';
-import { mockLinkedPipelines, mockProjectFullPath, mockProjectPipeline } from '../../mock_data';
-
-Vue.use(VueApollo);
-
-describe('Pipeline Status', () => {
-  let wrapper;
-  let mockApollo;
-  let mockLinkedPipelinesQuery;
-
-  const createComponent = ({ hasStages = true, options } = {}) => {
-    wrapper = shallowMount(PipelineEditorMiniGraph, {
-      provide: {
-        dataMethod: 'graphql',
-        projectFullPath: mockProjectFullPath,
-      },
-      propsData: {
-        pipeline: mockProjectPipeline({ hasStages }).pipeline,
-      },
-      ...options,
-    });
-  };
-
-  const createComponentWithApollo = (hasStages = true) => {
-    const handlers = [[getLinkedPipelinesQuery, mockLinkedPipelinesQuery]];
-    mockApollo = createMockApollo(handlers);
-
-    createComponent({
-      hasStages,
-      options: {
-        apolloProvider: mockApollo,
-      },
-    });
-  };
-
-  const findPipelineMiniGraph = () => wrapper.findComponent(PipelineMiniGraph);
-
-  beforeEach(() => {
-    mockLinkedPipelinesQuery = jest.fn();
-  });
-
-  afterEach(() => {
-    mockLinkedPipelinesQuery.mockReset();
-    wrapper.destroy();
-  });
-
-  describe('when there are stages', () => {
-    beforeEach(() => {
-      createComponent();
-    });
-
-    it('renders pipeline mini graph', () => {
-      expect(findPipelineMiniGraph().exists()).toBe(true);
-    });
-  });
-
-  describe('when there are no stages', () => {
-    beforeEach(() => {
-      createComponent({ hasStages: false });
-    });
-
-    it('does not render pipeline mini graph', () => {
-      expect(findPipelineMiniGraph().exists()).toBe(false);
-    });
-  });
-
-  describe('when querying upstream and downstream pipelines', () => {
-    describe('when query succeeds', () => {
-      beforeEach(() => {
-        mockLinkedPipelinesQuery.mockResolvedValue(mockLinkedPipelines());
-        createComponentWithApollo();
-      });
-
-      it('should call the query with the correct variables', () => {
-        expect(mockLinkedPipelinesQuery).toHaveBeenCalledTimes(1);
-        expect(mockLinkedPipelinesQuery).toHaveBeenCalledWith({
-          fullPath: mockProjectFullPath,
-          iid: mockProjectPipeline().pipeline.iid,
-        });
-      });
-    });
-
-    describe('when query fails', () => {
-      beforeEach(async () => {
-        mockLinkedPipelinesQuery.mockRejectedValue(new Error());
-        createComponentWithApollo();
-        await waitForPromises();
-      });
-
-      it('should emit an error event when query fails', async () => {
-        expect(wrapper.emitted('showError')).toHaveLength(1);
-        expect(wrapper.emitted('showError')[0]).toEqual([
-          {
-            type: PIPELINE_FAILURE,
-            reasons: [wrapper.vm.$options.i18n.linkedPipelinesFetchError],
-          },
-        ]);
-      });
-    });
-  });
-});
diff --git a/spec/frontend/ci/pipeline_editor/mock_data.js b/spec/frontend/ci/pipeline_editor/mock_data.js
index 176dc24f169..541123d7efc 100644
--- a/spec/frontend/ci/pipeline_editor/mock_data.js
+++ b/spec/frontend/ci/pipeline_editor/mock_data.js
@@ -373,13 +373,64 @@ export const mockLinkedPipelines = ({ hasDownstream = true, hasUpstream = true }
         {
           id: 'gid://gitlab/Ci::Pipeline/612',
           path: '/root/job-log-sections/-/pipelines/612',
-          project: { name: 'job-log-sections', __typename: 'Project' },
+          project: {
+            id: 'gid://gitlab/Project/21',
+            name: 'job-log-sections',
+            __typename: 'Project',
+          },
+          detailedStatus: {
+            id: 'success-612-612',
+            group: 'success',
+            icon: 'status_success',
+            label: 'passed',
+            __typename: 'DetailedStatus',
+          },
+          sourceJob: {
+            id: 'gid://gitlab/Ci::Bridge/532',
+            retried: false,
+          },
+          __typename: 'Pipeline',
+        },
+        {
+          id: 'gid://gitlab/Ci::Pipeline/611',
+          path: '/root/job-log-sections/-/pipelines/611',
+          project: {
+            id: 'gid://gitlab/Project/21',
+            name: 'job-log-sections',
+            __typename: 'Project',
+          },
           detailedStatus: {
+            id: 'success-611-611',
             group: 'success',
             icon: 'status_success',
             label: 'passed',
             __typename: 'DetailedStatus',
           },
+          sourceJob: {
+            id: 'gid://gitlab/Ci::Bridge/531',
+            retried: true,
+          },
+          __typename: 'Pipeline',
+        },
+        {
+          id: 'gid://gitlab/Ci::Pipeline/609',
+          path: '/root/job-log-sections/-/pipelines/609',
+          project: {
+            id: 'gid://gitlab/Project/21',
+            name: 'job-log-sections',
+            __typename: 'Project',
+          },
+          detailedStatus: {
+            id: 'success-609-609',
+            group: 'success',
+            icon: 'status_success',
+            label: 'passed',
+            __typename: 'DetailedStatus',
+          },
+          sourceJob: {
+            id: 'gid://gitlab/Ci::Bridge/530',
+            retried: true,
+          },
           __typename: 'Pipeline',
         },
       ],
@@ -391,8 +442,13 @@ export const mockLinkedPipelines = ({ hasDownstream = true, hasUpstream = true }
     upstream = {
       id: 'gid://gitlab/Ci::Pipeline/610',
       path: '/root/trigger-downstream/-/pipelines/610',
-      project: { name: 'trigger-downstream', __typename: 'Project' },
+      project: {
+        id: 'gid://gitlab/Project/21',
+        name: 'trigger-downstream',
+        __typename: 'Project',
+      },
       detailedStatus: {
+        id: 'success-610-610',
         group: 'success',
         icon: 'status_success',
         label: 'passed',
@@ -405,7 +461,9 @@ export const mockLinkedPipelines = ({ hasDownstream = true, hasUpstream = true }
   return {
     data: {
       project: {
+        id: 'gid://gitlab/Project/21',
         pipeline: {
+          id: 'gid://gitlab/Ci::Pipeline/790',
           path: '/root/ci-project/-/pipelines/790',
           downstream,
           upstream,