Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 3 deletions

diff --git a/spec/frontend/ci/runner/group_runners/group_runners_app_spec.js b/spec/frontend/ci/runner/group_runners/group_runners_app_spec.js
index 41be72b1645..74eeb864cd8 100644
--- a/spec/frontend/ci/runner/group_runners/group_runners_app_spec.js
+++ b/spec/frontend/ci/runner/group_runners/group_runners_app_spec.js
@@ -82,6 +82,7 @@ jest.mock('~/lib/utils/url_utility', () => ({
 
 describe('GroupRunnersApp', () => {
   let wrapper;
+  const showToast = jest.fn();
 
   const findRunnerStats = () => wrapper.findComponent(RunnerStats);
   const findRunnerActionsCell = () => wrapper.findComponent(RunnerActionsCell);
@@ -123,6 +124,11 @@ describe('GroupRunnersApp', () => {
         staleTimeoutSecs,
         ...provide,
       },
+      mocks: {
+        $toast: {
+          show: showToast,
+        },
+      },
       ...options,
     });
 
@@ -250,8 +256,6 @@ describe('GroupRunnersApp', () => {
   });
 
   describe('Single runner row', () => {
-    let showToast;
-
     const { webUrl, editUrl, node } = mockGroupRunnersEdges[0];
     const { id: graphqlId, shortSha, jobExecutionStatus } = node;
     const id = getIdFromGraphQLId(graphqlId);
@@ -260,7 +264,6 @@ describe('GroupRunnersApp', () => {
 
     beforeEach(async () => {
       await createComponent({ mountFn: mountExtended });
-      showToast = jest.spyOn(wrapper.vm.$root.$toast, 'show');
     });
 
     it('Shows job status and links to jobs', () => {