Merge branch '2682-cross-project-pipelines-are-broken' into 'master'

Resolve "Cross-project pipelines are broken"

Closes #2682

See merge request !2166

app/assets/javascripts/pipelines/components/graph/graph_component.vue

@@ -29,7 +29,8 @@
         return this.pipeline.triggered || [];
       },
       triggeredBy() {
-        return this.pipeline.triggeredBy || [];
+        const response = this.pipeline.triggered_by;
+        return response ? [response] : [];
       },
       hasTriggered() {
         return !!this.triggered.length;

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js

@@ -38,7 +38,8 @@ export default {
       return this.mr.pipeline.triggered || [];
     },
     triggeredBy() {
-      return this.mr.pipeline.triggered_by || [];
+      const response = this.mr.pipeline.triggered_by;
+      return response ? [response] : [];
     },
   },
   template: `

spec/javascripts/pipelines/graph/graph_component_spec.js

@@ -7,7 +7,7 @@ const GraphComponent = Vue.extend(graphComponent);
 
 const pipelineJSON = Object.assign(graphJSON, {
   triggered: linkedPipelineJSON.triggered,
-  triggeredBy: linkedPipelineJSON.triggered_by,
+  triggered_by: linkedPipelineJSON.triggered_by,
 });
 
 const defaultPropsData = {
@@ -83,6 +83,10 @@ describe('graph component', function () {
     });
 
     describe('linked pipelines components', function () {
+      it('should coerce triggeredBy into a collection', function () {
+        expect(this.component.triggeredBy.length).toBe(1);
+      });
+
       it('should render an upstream pipelines column', function () {
         expect(this.component.$el.querySelector('.linked-pipelines-column')).not.toBeNull();
         expect(this.component.$el.innerHTML).toContain('Upstream');
@@ -97,7 +101,7 @@ describe('graph component', function () {
 
   describe('when linked pipelines are not present', function () {
     beforeEach(function () {
-      const pipeline = Object.assign(graphJSON, { triggered: [], triggeredBy: [] });
+      const pipeline = Object.assign(graphJSON, { triggered: [], triggered_by: [] });
       this.component = new GraphComponent({
         propsData: { pipeline, isLoading: false },
       }).$mount();

spec/javascripts/pipelines/graph/linked_pipelines_mock_data.js

 /* eslint-disable quote-props, quotes, comma-dangle */
 
 export default {
-  "triggered_by": [{
+  "triggered_by": {
     "id": 129,
     "active": true,
     "path": "/gitlab-org/gitlab-ce/pipelines/129",
@@ -56,7 +56,7 @@ export default {
     "cancel_path": "/gitlab-org/gitlab-ce/pipelines/129/cancel",
     "created_at": "2017-05-24T14:46:20.090Z",
     "updated_at": "2017-05-24T14:46:29.906Z"
-  }],
+  },
   "triggered": [{
     "id": 132,
     "active": true,

spec/javascripts/vue_mr_widget/components/mr_widget_pipeline_spec.js

@@ -130,6 +130,14 @@ describe('MRWidgetPipeline', () => {
       });
     });
 
+    it('should set triggered to an empty array', () => {
+      expect(vm.triggered.length).toBe(0);
+    });
+
+    it('should set triggeredBy to an empty array', () => {
+      expect(vm.triggeredBy.length).toBe(0);
+    });
+
     it('should not render upstream or downstream pipelines', () => {
       expect(el.querySelector('.linked-pipeline-mini-list')).toBeNull();
     });
@@ -149,6 +157,10 @@ describe('MRWidgetPipeline', () => {
       }).$mount();
     });
 
+    it('should coerce triggeredBy into a collection', function () {
+      expect(this.vm.triggeredBy.length).toBe(1);
+    });
+
     it('should render the linked pipelines mini list', function (done) {
       Vue.nextTick(() => {
         expect(this.vm.$el.querySelector('.linked-pipeline-mini-list.is-upstream')).not.toBeNull();

spec/javascripts/vue_shared/components/linked_pipelines_mini_list_spec.js

@@ -9,7 +9,7 @@ describe('Linked pipeline mini list', () => {
     beforeEach(() => {
       this.component = new ListComponent({
         propsData: {
-          triggeredBy: mockData.triggered_by,
+          triggeredBy: [mockData.triggered_by],
         },
       }).$mount();
     });