diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-07 16:44:14 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-07 16:44:14 +0000 |
| commit | 1d0820c71872934e6f7d8c6a4df8889b797f0fa6 (patch) | |
| tree | 8ca6147a6f98381cf6e51a3a3b09d9c73fd52b4f | |
| parent | edebf5389ff9907b0c3d4c5496b3e947c43bc3ff (diff) | |
| download | gitlab-ce-1d0820c71872934e6f7d8c6a4df8889b797f0fa6.tar.gz | |
Fix broken specs from the Frontend side
| -rw-r--r-- | spec/javascripts/commit/pipelines/mock_data.js.es6 | 2 | ||||
| -rw-r--r-- | spec/javascripts/commit/pipelines/pipelines_spec.js.es6 | 11 | ||||
| -rw-r--r-- | spec/javascripts/vue_shared/components/commit_spec.js.es6 | 2 |
3 files changed, 8 insertions, 7 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/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; |