diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-21 17:39:04 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-21 17:39:04 +0300 |
| commit | 48b1455566a51f4dea6b3b86553d2f239266a1f9 (patch) | |
| tree | 02fb323f1a3137351d3128a0d2de74efde8f9e7d /spec/javascripts | |
| parent | 4e3f7a56054d0113b223276ce2360fc53c08b954 (diff) | |
| parent | bb9e7a3f2cf80c09b64156988abb9ffba1de6d2c (diff) | |
Merge branch 'ce-3776-ci-view-for-sast' into 'master'
CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18n
See merge request gitlab-org/gitlab-ce!17176
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({}); }); |