diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 12:08:32 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-04 12:08:32 +0300 |
commit | 7d19df2d34a9803d9f077c16315ba919b7ae2aa2 (patch) | |
tree | 80a824f477c1b450a1f082576a00d6851f3c6582 /spec/javascripts/issue_show | |
parent | cebee31a0483ef7f2cade3d6dde0a53a68e86cc6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/issue_show')
-rw-r--r-- | spec/javascripts/issue_show/components/app_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/issue_show/mock_data.js | 25 |
2 files changed, 3 insertions, 26 deletions
diff --git a/spec/javascripts/issue_show/components/app_spec.js b/spec/javascripts/issue_show/components/app_spec.js index 4c405fbc4d1..fdd6f4e6470 100644 --- a/spec/javascripts/issue_show/components/app_spec.js +++ b/spec/javascripts/issue_show/components/app_spec.js @@ -7,13 +7,13 @@ import axios from '~/lib/utils/axios_utils'; import '~/behaviors/markdown/render_gfm'; import issuableApp from '~/issue_show/components/app.vue'; import eventHub from '~/issue_show/event_hub'; -import issueShowData from '../mock_data'; +import { initialRequest, secondRequest } from '../mock_data'; function formatText(text) { return text.trim().replace(/\s\s+/g, ' '); } -const REALTIME_REQUEST_STACK = [issueShowData.initialRequest, issueShowData.secondRequest]; +const REALTIME_REQUEST_STACK = [initialRequest, secondRequest]; describe('Issuable output', () => { let mock; diff --git a/spec/javascripts/issue_show/mock_data.js b/spec/javascripts/issue_show/mock_data.js index f4475aadb8b..1b391bd1588 100644 --- a/spec/javascripts/issue_show/mock_data.js +++ b/spec/javascripts/issue_show/mock_data.js @@ -1,24 +1 @@ -export default { - initialRequest: { - title: '<p>this is a title</p>', - title_text: 'this is a title', - description: '<p>this is a description!</p>', - description_text: 'this is a description', - task_status: '2 of 4 completed', - updated_at: '2015-05-15T12:31:04.428Z', - updated_by_name: 'Some User', - updated_by_path: '/some_user', - lock_version: 1, - }, - secondRequest: { - title: '<p>2</p>', - title_text: '2', - description: '<p>42</p>', - description_text: '42', - task_status: '0 of 0 completed', - updated_at: '2016-05-15T12:31:04.428Z', - updated_by_name: 'Other User', - updated_by_path: '/other_user', - lock_version: 2, - }, -}; +export * from '../../frontend/issue_show/mock_data'; |