From d776c19ef39b2114f345addff5b5dd7b1eaa6d2a Mon Sep 17 00:00:00 2001 From: Eduardo San Martin Morote Date: Mon, 6 May 2019 19:58:12 +0200 Subject: [PATCH] test: refactor types --- __tests__/guards/component-beforeRouteEnter.spec.js | 9 +++++++-- __tests__/guards/component-beforeRouteLeave.spec.js | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/__tests__/guards/component-beforeRouteEnter.spec.js b/__tests__/guards/component-beforeRouteEnter.spec.js index 9f5a979f..ac3b9170 100644 --- a/__tests__/guards/component-beforeRouteEnter.spec.js +++ b/__tests__/guards/component-beforeRouteEnter.spec.js @@ -6,8 +6,11 @@ const { Router } = require('../../src/router') const fakePromise = require('faked-promise') const { NAVIGATION_TYPES, createDom, noGuard } = require('../utils') +/** @typedef {import('../../src/types').RouteRecord} RouteRecord */ +/** @typedef {import('../../src/router').RouterOptions} RouterOptions */ + /** - * @param {Partial & { routes: import('../../src/types').RouteRecord[]}} options + * @param {Partial & { routes: RouteRecord[]}} options */ function createRouter(options) { return new Router({ @@ -24,6 +27,7 @@ const named = { default: jest.fn(), other: jest.fn(), } + const nested = { parent: jest.fn(), nestedEmpty: jest.fn(), @@ -33,7 +37,8 @@ const nested = { nestedNestedFoo: jest.fn(), nestedNestedParam: jest.fn(), } -/** @type {import('../../src/types').RouteRecord[]} */ + +/** @type {RouteRecord[]} */ const routes = [ { path: '/', component: Home }, { path: '/foo', component: Foo }, diff --git a/__tests__/guards/component-beforeRouteLeave.spec.js b/__tests__/guards/component-beforeRouteLeave.spec.js index caab1a6e..cee6670a 100644 --- a/__tests__/guards/component-beforeRouteLeave.spec.js +++ b/__tests__/guards/component-beforeRouteLeave.spec.js @@ -4,10 +4,13 @@ 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') + +/** @typedef {import('../../src/types').RouteRecord} RouteRecord */ +/** @typedef {import('../../src/router').RouterOptions} RouterOptions */ /** - * @param {Partial & { routes: import('../../src/types').RouteRecord[]}} options + * @param {Partial & { routes: RouteRecord[]}} options */ function createRouter(options) { return new Router({ @@ -20,7 +23,8 @@ const Home = { template: `
Home
` } const Foo = { template: `
Foo
` } const beforeRouteLeave = jest.fn() -/** @type {import('../../src/types').RouteRecord[]} */ + +/** @type {RouteRecord[]} */ const routes = [ { path: '/', component: Home }, { path: '/foo', component: Foo }, -- 2.47.3