Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 5 deletions

diff --git a/spec/frontend/issuable_suggestions/components/item_spec.js b/spec/frontend/issuable_suggestions/components/item_spec.js
index 6c3c30fcbb0..36799f4ee9f 100644
--- a/spec/frontend/issuable_suggestions/components/item_spec.js
+++ b/spec/frontend/issuable_suggestions/components/item_spec.js
@@ -4,6 +4,7 @@ import Icon from '~/vue_shared/components/icon.vue';
 import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue';
 import Suggestion from '~/issuable_suggestions/components/item.vue';
 import mockData from '../mock_data';
+import { TEST_HOST } from 'jest/helpers/test_constants';
 
 describe('Issuable suggestions suggestion component', () => {
   let vm;
@@ -34,7 +35,7 @@ describe('Issuable suggestions suggestion component', () => {
 
     const link = vm.find(GlLink);
 
-    expect(link.attributes('href')).toBe(`${gl.TEST_HOST}/test/issue/1`);
+    expect(link.attributes('href')).toBe(`${TEST_HOST}/test/issue/1`);
   });
 
   it('renders IID', () => {
@@ -100,7 +101,7 @@ describe('Issuable suggestions suggestion component', () => {
 
       const image = vm.find(UserAvatarImage);
 
-      expect(image.props('imgSrc')).toBe(`${gl.TEST_HOST}/avatar`);
+      expect(image.props('imgSrc')).toBe(`${TEST_HOST}/avatar`);
     });
   });
 
diff --git a/spec/frontend/issuable_suggestions/mock_data.js b/spec/frontend/issuable_suggestions/mock_data.js
index 4f0f9ef8d62..4ce35ad5196 100644
--- a/spec/frontend/issuable_suggestions/mock_data.js
+++ b/spec/frontend/issuable_suggestions/mock_data.js
@@ -1,3 +1,5 @@
+import { TEST_HOST } from 'jest/helpers/test_constants';
+
 function getDate(daysMinus) {
   const today = new Date();
   today.setDate(today.getDate() - daysMinus);
@@ -15,12 +17,12 @@ export default () => ({
   createdAt: getDate(3),
   updatedAt: getDate(2),
   confidential: false,
-  webUrl: `${gl.TEST_HOST}/test/issue/1`,
+  webUrl: `${TEST_HOST}/test/issue/1`,
   title: 'Test issue',
   author: {
-    avatarUrl: `${gl.TEST_HOST}/avatar`,
+    avatarUrl: `${TEST_HOST}/avatar`,
     name: 'Author Name',
     username: 'author.username',
-    webUrl: `${gl.TEST_HOST}/author`,
+    webUrl: `${TEST_HOST}/author`,
   },
 });