Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 6 deletions

diff --git a/spec/frontend/vue_shared/components/runner_instructions/instructions/runner_docker_instructions_spec.js b/spec/frontend/vue_shared/components/runner_instructions/instructions/runner_docker_instructions_spec.js
index 94823bb640b..b94d8c1de21 100644
--- a/spec/frontend/vue_shared/components/runner_instructions/instructions/runner_docker_instructions_spec.js
+++ b/spec/frontend/vue_shared/components/runner_instructions/instructions/runner_docker_instructions_spec.js
@@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 
 import { GlButton } from '@gitlab/ui';
 import RunnerDockerInstructions from '~/vue_shared/components/runner_instructions/instructions/runner_docker_instructions.vue';
+import { DOCS_URL } from 'jh_else_ce/lib/utils/url_utility';
 
 describe('RunnerDockerInstructions', () => {
   let wrapper;
@@ -25,8 +26,6 @@ describe('RunnerDockerInstructions', () => {
   });
 
   it('renders link', () => {
-    expect(findButton().attributes('href')).toBe(
-      'https://docs.gitlab.com/runner/install/docker.html',
-    );
+    expect(findButton().attributes('href')).toBe(`${DOCS_URL}/runner/install/docker.html`);
   });
 });
diff --git a/spec/frontend/vue_shared/components/runner_instructions/instructions/runner_kubernetes_instructions_spec.js b/spec/frontend/vue_shared/components/runner_instructions/instructions/runner_kubernetes_instructions_spec.js
index 9d6658e002c..f0b033a2ca2 100644
--- a/spec/frontend/vue_shared/components/runner_instructions/instructions/runner_kubernetes_instructions_spec.js
+++ b/spec/frontend/vue_shared/components/runner_instructions/instructions/runner_kubernetes_instructions_spec.js
@@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 
 import { GlButton } from '@gitlab/ui';
 import RunnerKubernetesInstructions from '~/vue_shared/components/runner_instructions/instructions/runner_kubernetes_instructions.vue';
+import { DOCS_URL } from 'jh_else_ce/lib/utils/url_utility';
 
 describe('RunnerKubernetesInstructions', () => {
   let wrapper;
@@ -25,8 +26,6 @@ describe('RunnerKubernetesInstructions', () => {
   });
 
   it('renders link', () => {
-    expect(findButton().attributes('href')).toBe(
-      'https://docs.gitlab.com/runner/install/kubernetes.html',
-    );
+    expect(findButton().attributes('href')).toBe(`${DOCS_URL}/runner/install/kubernetes.html`);
   });
 });