diff options
| author | Phil Hughes <me@iamphill.com> | 2019-04-25 14:21:40 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-25 14:21:40 +0000 |
| commit | 1e2d4a217a06da4fc92efa5c6f2e13873b2f2067 (patch) | |
| tree | 0c4697a7e3d24ed9146240672d3fb6248c97511d | |
| parent | 69f0ae40b2cf40b56b0c3c6127fecbc9ddc541b9 (diff) | |
| parent | c005c97914f1bdff33b0ad77b2e2e855044ee39b (diff) | |
| download | gitlab-ce-1e2d4a217a06da4fc92efa5c6f2e13873b2f2067.tar.gz | |
Merge branch 'refactor/58829-migrate-notes-spec-to-jest' into 'master'
Refactor/58829 migrate notes spec to jest
Closes #58829
See merge request gitlab-org/gitlab-ce!27648
| -rw-r--r-- | changelogs/unreleased/refactor-58829-migrate-notes-spec-to-jest.yml | 5 | ||||
| -rw-r--r-- | spec/frontend/vue_shared/components/notes/placeholder_note_spec.js (renamed from spec/javascripts/vue_shared/components/notes/placeholder_note_spec.js) | 2 | ||||
| -rw-r--r-- | spec/frontend/vue_shared/components/notes/placeholder_system_note_spec.js (renamed from spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js) | 2 | ||||
| -rw-r--r-- | spec/frontend/vue_shared/components/notes/system_note_spec.js (renamed from spec/javascripts/vue_shared/components/notes/system_note_spec.js) | 0 |
4 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/refactor-58829-migrate-notes-spec-to-jest.yml b/changelogs/unreleased/refactor-58829-migrate-notes-spec-to-jest.yml new file mode 100644 index 00000000000..9a1886797da --- /dev/null +++ b/changelogs/unreleased/refactor-58829-migrate-notes-spec-to-jest.yml @@ -0,0 +1,5 @@ +--- +title: 'Refactored notes tests from Karma to Jest' +merge_request: 27648 +author: Martin Hobert +type: other diff --git a/spec/javascripts/vue_shared/components/notes/placeholder_note_spec.js b/spec/frontend/vue_shared/components/notes/placeholder_note_spec.js index 45f131194ca..eafff7f681e 100644 --- a/spec/javascripts/vue_shared/components/notes/placeholder_note_spec.js +++ b/spec/frontend/vue_shared/components/notes/placeholder_note_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import issuePlaceholderNote from '~/vue_shared/components/notes/placeholder_note.vue'; import createStore from '~/notes/stores'; -import { userDataMock } from '../../../notes/mock_data'; +import { userDataMock } from '../../../../javascripts/notes/mock_data'; describe('issue placeholder system note component', () => { let store; diff --git a/spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js b/spec/frontend/vue_shared/components/notes/placeholder_system_note_spec.js index 6013e85811a..976e38c15ee 100644 --- a/spec/javascripts/vue_shared/components/notes/placeholder_system_note_spec.js +++ b/spec/frontend/vue_shared/components/notes/placeholder_system_note_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import placeholderSystemNote from '~/vue_shared/components/notes/placeholder_system_note.vue'; -import mountComponent from 'spec/helpers/vue_mount_component_helper'; +import mountComponent from 'helpers/vue_mount_component_helper'; describe('placeholder system note component', () => { let PlaceholderSystemNote; diff --git a/spec/javascripts/vue_shared/components/notes/system_note_spec.js b/spec/frontend/vue_shared/components/notes/system_note_spec.js index adcb1c858aa..adcb1c858aa 100644 --- a/spec/javascripts/vue_shared/components/notes/system_note_spec.js +++ b/spec/frontend/vue_shared/components/notes/system_note_spec.js |
