test: refactor using noGuard util

diff --git a/__tests__/guards/component-beforeRouteEnter.spec.js b/__tests__/guards/component-beforeRouteEnter.spec.js
index 01b749bc8976cc8011bbe94b17a561c335a4eabb..e9080dbb45c6bae83c1edc8f146fa07621d059b7 100644 (file)
--- a/__tests__/guards/component-beforeRouteEnter.spec.js
+++ b/__tests__/guards/component-beforeRouteEnter.spec.js
@@ -4,7 +4,7 @@ const expect = require('expect')
 const { HTML5History } = require('../../src/history/html5')
 const { Router } = require('../../src/router')
 const fakePromise = require('faked-promise')
-const { NAVIGATION_TYPES, createDom } = require('../utils')
+const { NAVIGATION_TYPES, createDom, noGuard } = require('../utils')
 
 /**
  * @param {Partial<import('../../src/router').RouterOptions> & { routes: import('../../src/types').RouteRecord[]}} options
@@ -55,7 +55,7 @@ describe('beforeRouteEnter', () => {
       })
 
       it('resolves async components before guarding', async () => {
-        const spy = jest.fn((to, from, next) => next())
+        const spy = jest.fn(noGuard)
         const component = {
           template: `<div></div>`,
           beforeRouteEnter: spy,
@@ -74,9 +74,7 @@ describe('beforeRouteEnter', () => {
 
       it('does not call beforeRouteEnter if we were already on the page', async () => {
         const router = createRouter({ routes })
-        beforeRouteEnter.mockImplementation((to, from, next) => {
-          next()
-        })
+        beforeRouteEnter.mockImplementation(noGuard)
         await router.push('/guard/one')
         expect(beforeRouteEnter).toHaveBeenCalledTimes(1)
         await router[navigationMethod]('/guard/one')

diff --git a/__tests__/utils.ts b/__tests__/utils.ts
index d5c234a902840f26d53b05ff1c5e166efe628cf5..e352b24a3493318422fb9eac4dfc81fffbc2803d 100644 (file)
--- a/__tests__/utils.ts
+++ b/__tests__/utils.ts
@@ -1,4 +1,6 @@
 import { JSDOM, ConstructorOptions } from 'jsdom'
+import {} from '../src/types'
+import { NavigationGuard } from '../../vue-router/types'
 
 export const tick = () => new Promise(resolve => process.nextTick(resolve))
 
@@ -25,6 +27,10 @@ export function createDom(options?: ConstructorOptions) {
   return dom
 }
 
+export const noGuard: NavigationGuard = (to, from, next) => {
+  next()
+}
+
 export const components = {
   Home: { template: `<div>Home</div>` },
   Foo: { template: `<div>Foo</div>` },