Add latest changes from gitlab-org/gitlab@master

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';