diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-21 14:56:32 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-21 14:56:32 +0000 |
| commit | 151a43c82e12e019cef62d1c54d9ebf944505325 (patch) | |
| tree | 67e6d160e2f5686816e07685a82cc71223d0e45a /spec/javascripts | |
| parent | f95bdc67845f8990aaa2c8a605b5ced459c5f5b4 (diff) | |
| parent | 48b1455566a51f4dea6b3b86553d2f239266a1f9 (diff) | |
| download | gitlab-ce-rest-of-dispatcher.tar.gz | |
Merge branch 'master' into 'rest-of-dispatcher'rest-of-dispatcher
# Conflicts:
# app/assets/javascripts/dispatcher.js
Diffstat (limited to 'spec/javascripts')
| -rw-r--r-- | spec/javascripts/pipelines/pipeline_details_mediator_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/pipelines/pipeline_store_spec.js | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/spec/javascripts/pipelines/pipeline_details_mediator_spec.js b/spec/javascripts/pipelines/pipeline_details_mediator_spec.js index bc6413a159f..e58a8018ed5 100644 --- a/spec/javascripts/pipelines/pipeline_details_mediator_spec.js +++ b/spec/javascripts/pipelines/pipeline_details_mediator_spec.js @@ -1,6 +1,6 @@ import _ from 'underscore'; import Vue from 'vue'; -import PipelineMediator from '~/pipelines/pipeline_details_mediatior'; +import PipelineMediator from '~/pipelines/pipeline_details_mediator'; describe('PipelineMdediator', () => { let mediator; diff --git a/spec/javascripts/pipelines/pipeline_store_spec.js b/spec/javascripts/pipelines/pipeline_store_spec.js index 85d13445b01..ab2287cc344 100644 --- a/spec/javascripts/pipelines/pipeline_store_spec.js +++ b/spec/javascripts/pipelines/pipeline_store_spec.js @@ -8,7 +8,6 @@ describe('Pipeline Store', () => { }); it('should set defaults', () => { - expect(store.state).toEqual({ pipeline: {} }); expect(store.state.pipeline).toEqual({}); }); |