From 8b4b5ba6331ca0503b8f3d0e5e36de9f8ef64aa3 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Mon, 26 Mar 2018 23:10:08 +0200 Subject: [PATCH] test(nav): fix tests --- .../nav/test/nav-controller.spec.ts | 44 +++++++++---------- core/src/components/router/router.tsx | 5 +-- core/src/components/router/utils/debug.ts | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/core/src/components/nav/test/nav-controller.spec.ts b/core/src/components/nav/test/nav-controller.spec.ts index 33522975d7..93f8ab0b1a 100644 --- a/core/src/components/nav/test/nav-controller.spec.ts +++ b/core/src/components/nav/test/nav-controller.spec.ts @@ -28,7 +28,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(push1Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view1, undefined, NavDirection.forward + hasCompleted, requiresTransition, view1, undefined, NavDirection.Forward ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -38,7 +38,7 @@ describe('NavController', () => { await nav.push(view2, null, {animate: false}, push2Done); expect(push2Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view1, NavDirection.forward + hasCompleted, requiresTransition, view2, view1, NavDirection.Forward ); expect(nav.length()).toEqual(2); @@ -50,7 +50,7 @@ describe('NavController', () => { await nav.push(view3, null, {animate: false}, push3Done); expect(push3Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view3, view2, NavDirection.forward + hasCompleted, requiresTransition, view3, view2, NavDirection.Forward ); expect(nav.length()).toEqual(3); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -61,7 +61,7 @@ describe('NavController', () => { const view4 = mockView(MockView4); await nav.push(view4, null, {animate: false}, push4Done); expect(push4Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view4, view3, NavDirection.forward + hasCompleted, requiresTransition, view4, view3, NavDirection.Forward ); expect(nav.length()).toEqual(4); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -72,7 +72,7 @@ describe('NavController', () => { // Pop 1 await nav.pop({animate: false}, pop1Done); expect(pop1Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view3, view4, NavDirection.back + hasCompleted, requiresTransition, view3, view4, NavDirection.Back ); expect(nav.length()).toEqual(3); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -82,7 +82,7 @@ describe('NavController', () => { // Pop 2 await nav.pop({animate: false}, pop2Done); expect(pop2Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view3, NavDirection.back + hasCompleted, requiresTransition, view2, view3, NavDirection.Back ); expect(nav.length()).toEqual(2); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -91,7 +91,7 @@ describe('NavController', () => { // Pop 3 await nav.pop({animate: false}, pop3Done); expect(pop3Done).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view1, view2, NavDirection.back + hasCompleted, requiresTransition, view1, view2, NavDirection.Back ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -108,7 +108,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view1, undefined, NavDirection.forward + hasCompleted, requiresTransition, view1, undefined, NavDirection.Forward ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -126,7 +126,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view1, NavDirection.forward + hasCompleted, requiresTransition, view2, view1, NavDirection.Forward ); expect(nav.length()).toEqual(2); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -165,7 +165,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view1, NavDirection.forward + hasCompleted, requiresTransition, view2, view1, NavDirection.Forward ); expect(nav.length()).toEqual(2); @@ -223,7 +223,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view1, NavDirection.forward + hasCompleted, requiresTransition, view2, view1, NavDirection.Forward ); expect(nav.length()).toEqual(2); expect(nav._views[nav._views.length - 1].component).toEqual(MockView2); @@ -239,7 +239,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view1, NavDirection.forward + hasCompleted, requiresTransition, view2, view1, NavDirection.Forward ); expect(nav.length()).toEqual(2); expect(nav._views[nav._views.length - 1].component).toEqual(MockView2); @@ -399,7 +399,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view1, view2, NavDirection.back + hasCompleted, requiresTransition, view1, view2, NavDirection.Back ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -423,7 +423,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view3, NavDirection.back + hasCompleted, requiresTransition, view2, view3, NavDirection.Back ); expect(nav.length()).toEqual(2); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -444,7 +444,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view4, NavDirection.back + hasCompleted, requiresTransition, view2, view4, NavDirection.Back ); expect(nav.length()).toEqual(2); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -502,7 +502,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view1, view4, NavDirection.back + hasCompleted, requiresTransition, view1, view4, NavDirection.Back ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -562,7 +562,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view1, view4, NavDirection.back + hasCompleted, requiresTransition, view1, view4, NavDirection.Back ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -765,7 +765,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view4, NavDirection.back + hasCompleted, requiresTransition, view2, view4, NavDirection.Back ); expect(nav.length()).toEqual(2); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -862,7 +862,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view2, view3, NavDirection.back + hasCompleted, requiresTransition, view2, view3, NavDirection.Back ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView2); @@ -907,7 +907,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view1, view3, NavDirection.back + hasCompleted, requiresTransition, view1, view3, NavDirection.Back ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView1); @@ -935,7 +935,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view4, view3, NavDirection.back + hasCompleted, requiresTransition, view4, view3, NavDirection.Back ); expect(nav.length()).toEqual(1); expect(nav.getByIndex(0).component).toEqual(MockView4); @@ -968,7 +968,7 @@ describe('NavController', () => { const hasCompleted = true; const requiresTransition = true; expect(trnsDone).toHaveBeenCalledWith( - hasCompleted, requiresTransition, view5, view2, NavDirection.back + hasCompleted, requiresTransition, view5, view2, NavDirection.Back ); expect(nav.length()).toEqual(2); expect(nav.getByIndex(0).component).toEqual(MockView4); diff --git a/core/src/components/router/router.tsx b/core/src/components/router/router.tsx index 47ef115845..70c84ab4ce 100644 --- a/core/src/components/router/router.tsx +++ b/core/src/components/router/router.tsx @@ -5,8 +5,6 @@ import { readNavState, writeNavState } from './utils/dom'; import { chainToPath, generatePath, parsePath, readPath, writePath } from './utils/path'; import { RouteChain, RouteRedirect, RouterDirection, RouterEventDetail } from './utils/interfaces'; import { routeRedirect, routerIDsToChain, routerPathToChain } from './utils/matching'; -import { printRoutes } from './utils/debug'; - @Component({ tag: 'ion-router' @@ -52,8 +50,7 @@ export class Router { } const tree = readRoutes(this.el); this.routes = flattenRouterTree(tree); - - printRoutes(this.routes); + console.debug('[ion-router] route data changed', this.routes); // schedule write if (this.timer) { diff --git a/core/src/components/router/utils/debug.ts b/core/src/components/router/utils/debug.ts index 00b0e37748..036ae5b05a 100644 --- a/core/src/components/router/utils/debug.ts +++ b/core/src/components/router/utils/debug.ts @@ -2,7 +2,7 @@ import { generatePath } from './path'; import { RouteChain } from './interfaces'; export function printRoutes(routes: RouteChain[]) { - console.debug('%c[@ionic/core]', 'font-weight: bold', `ion-router registered ${routes.length} routes`); + console.debug('%c[ion-core]', 'font-weight: bold', `registered ${routes.length} routes`); for (const chain of routes) { const path: string[] = []; chain.forEach(r => path.push(...r.path));