Merge branch 'fix/gb/invalid-new-merge-request-api' into 'master'

Fix rendering pipelines for a new merge request

See merge request !9032

6 files changed, 17 insertions, 20 deletions

diff --git a/spec/javascripts/commit/pipelines/mock_data.js.es6 b/spec/javascripts/commit/pipelines/mock_data.js.es6
index 5f0f26a013c..188908d66bd 100644
--- a/spec/javascripts/commit/pipelines/mock_data.js.es6
+++ b/spec/javascripts/commit/pipelines/mock_data.js.es6
@@ -88,3 +88,5 @@ const pipeline = {
   created_at: '2017-01-16T17:13:59.800Z',
   updated_at: '2017-01-25T00:00:17.132Z',
 };
+
+module.exports = pipeline;
diff --git a/spec/javascripts/commit/pipelines/pipelines_spec.js.es6 b/spec/javascripts/commit/pipelines/pipelines_spec.js.es6
index c2b61632827..f09c57978a1 100644
--- a/spec/javascripts/commit/pipelines/pipelines_spec.js.es6
+++ b/spec/javascripts/commit/pipelines/pipelines_spec.js.es6
@@ -1,18 +1,17 @@
 /* global pipeline, Vue */
 
-require('vue-resource');
-require('flash');
+require('~/flash');
 require('~/commit/pipelines/pipelines_store');
 require('~/commit/pipelines/pipelines_service');
 require('~/commit/pipelines/pipelines_table');
-require('~vue_shared/vue_resource_interceptor');
-require('./mock_data');
+require('~/vue_shared/vue_resource_interceptor');
+const pipeline = require('./mock_data');
 
 describe('Pipelines table in Commits and Merge requests', () => {
-  preloadFixtures('pipelines_table');
+  preloadFixtures('static/pipelines_table.html.raw');
 
   beforeEach(() => {
-    loadFixtures('pipelines_table');
+    loadFixtures('static/pipelines_table.html.raw');
   });
 
   describe('successfull request', () => {
diff --git a/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6 b/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
index a5a16544ffb..559723bafcc 100644
--- a/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
+++ b/spec/javascripts/commit/pipelines/pipelines_store_spec.js.es6
@@ -1,10 +1,10 @@
-require('~commit/pipelines/pipelines_store');
+require('~/commit/pipelines/pipelines_store');
 
 describe('Store', () => {
-  const store = gl.commits.pipelines.PipelinesStore;
+  let store;
 
   beforeEach(() => {
-    store.create();
+    store = new gl.commits.pipelines.PipelinesStore();
   });
 
   it('should start with a blank state', () => {
@@ -23,7 +23,7 @@ describe('Store', () => {
       },
     ];
 
-    store.store(pipelines);
+    store.storePipelines(pipelines);
 
     expect(store.state.pipelines.length).toBe(pipelines.length);
   });
diff --git a/spec/javascripts/vue_shared/components/commit_spec.js.es6 b/spec/javascripts/vue_shared/components/commit_spec.js.es6
index 84d169a3fb9..15ab10b9b69 100644
--- a/spec/javascripts/vue_shared/components/commit_spec.js.es6
+++ b/spec/javascripts/vue_shared/components/commit_spec.js.es6
@@ -1,4 +1,4 @@
-require('~/vue_shared/components/committ');
+require('~/vue_shared/components/commit');
 
 describe('Commit component', () => {
   let props;
diff --git a/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es6 b/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es6
index e83a1749e82..412abfd5e41 100644
--- a/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es6
+++ b/spec/javascripts/vue_shared/components/pipelines_table_row_spec.js.es6
@@ -1,7 +1,5 @@
-/* global pipeline */
-
-require('~vue_shared/components/pipelines_table_row');
-require('./mock_data');
+require('~/vue_shared/components/pipelines_table_row');
+const pipeline = require('../../commit/pipelines/mock_data');
 
 describe('Pipelines Table Row', () => {
   let component;
diff --git a/spec/javascripts/vue_shared/components/pipelines_table_spec.js.es6 b/spec/javascripts/vue_shared/components/pipelines_table_spec.js.es6
index adc9ea904cc..54d81e2ea7d 100644
--- a/spec/javascripts/vue_shared/components/pipelines_table_spec.js.es6
+++ b/spec/javascripts/vue_shared/components/pipelines_table_spec.js.es6
@@ -1,8 +1,6 @@
-/* global pipeline */
-
-require('~vue_shared/components/pipelines_table');
-require('~lib/utils/datetime_utility');
-require('./mock_data');
+require('~/vue_shared/components/pipelines_table');
+require('~/lib/utils/datetime_utility');
+const pipeline = require('../../commit/pipelines/mock_data');
 
 describe('Pipelines Table', () => {
   preloadFixtures('static/environments/element.html.raw');