diff options
| author | Shah El-Rahman <selrahman@gitlab.com> | 2018-02-22 02:59:42 +0300 |
|---|---|---|
| committer | Shah El-Rahman <selrahman@gitlab.com> | 2018-02-22 02:59:42 +0300 |
| commit | ad860cc0efc2d513017ca9b491b2ba68874e1fe9 (patch) | |
| tree | 3d912e1ba662c1847a004aed79d0dd4f29326034 /spec/javascripts/pipelines | |
| parent | d4b55c3c720b875c9c22958c7c1e034fc1940755 (diff) | |
| parent | 88870c871eeb55ff43cf638ba8d7307b263393c3 (diff) | |
Merge branch 'master' into 42886-followup-to-new-design-for-cancel-stop-pipeline-confirmation
Diffstat (limited to 'spec/javascripts/pipelines')
| -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({}); }); |