javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-04 13:17:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

test(nav): fix tests

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-26 23:10:08 +02:00
parent d0c5f53a08
commit 8b4b5ba633
3 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/src/components/nav/test/nav-controller.spec.ts
View File

@ -28,7 +28,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(push1Done).toHaveBeenCalledWith( expect(push1Done).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view1, undefined, NavDirection.forward hasCompleted, requiresTransition, view1, undefined, NavDirection.Forward
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -38,7 +38,7 @@ describe('NavController', () => {
await nav.push(view2, null, {animate: false}, push2Done); await nav.push(view2, null, {animate: false}, push2Done);
expect(push2Done).toHaveBeenCalledWith( expect(push2Done).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view1, NavDirection.forward hasCompleted, requiresTransition, view2, view1, NavDirection.Forward
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
@ -50,7 +50,7 @@ describe('NavController', () => {
await nav.push(view3, null, {animate: false}, push3Done); await nav.push(view3, null, {animate: false}, push3Done);
expect(push3Done).toHaveBeenCalledWith( expect(push3Done).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view3, view2, NavDirection.forward hasCompleted, requiresTransition, view3, view2, NavDirection.Forward
); );
expect(nav.length()).toEqual(3); expect(nav.length()).toEqual(3);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -61,7 +61,7 @@ describe('NavController', () => {
const view4 = mockView(MockView4); const view4 = mockView(MockView4);
await nav.push(view4, null, {animate: false}, push4Done); await nav.push(view4, null, {animate: false}, push4Done);
expect(push4Done).toHaveBeenCalledWith( expect(push4Done).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view4, view3, NavDirection.forward hasCompleted, requiresTransition, view4, view3, NavDirection.Forward
); );
expect(nav.length()).toEqual(4); expect(nav.length()).toEqual(4);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -72,7 +72,7 @@ describe('NavController', () => {
// Pop 1 // Pop 1
await nav.pop({animate: false}, pop1Done); await nav.pop({animate: false}, pop1Done);
expect(pop1Done).toHaveBeenCalledWith( expect(pop1Done).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view3, view4, NavDirection.back hasCompleted, requiresTransition, view3, view4, NavDirection.Back
); );
expect(nav.length()).toEqual(3); expect(nav.length()).toEqual(3);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -82,7 +82,7 @@ describe('NavController', () => {
// Pop 2 // Pop 2
await nav.pop({animate: false}, pop2Done); await nav.pop({animate: false}, pop2Done);
expect(pop2Done).toHaveBeenCalledWith( expect(pop2Done).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view3, NavDirection.back hasCompleted, requiresTransition, view2, view3, NavDirection.Back
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -91,7 +91,7 @@ describe('NavController', () => {
// Pop 3 // Pop 3
await nav.pop({animate: false}, pop3Done); await nav.pop({animate: false}, pop3Done);
expect(pop3Done).toHaveBeenCalledWith( expect(pop3Done).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view1, view2, NavDirection.back hasCompleted, requiresTransition, view1, view2, NavDirection.Back
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -108,7 +108,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view1, undefined, NavDirection.forward hasCompleted, requiresTransition, view1, undefined, NavDirection.Forward
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -126,7 +126,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view1, NavDirection.forward hasCompleted, requiresTransition, view2, view1, NavDirection.Forward
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -165,7 +165,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view1, NavDirection.forward hasCompleted, requiresTransition, view2, view1, NavDirection.Forward
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
@ -223,7 +223,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view1, NavDirection.forward hasCompleted, requiresTransition, view2, view1, NavDirection.Forward
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
expect(nav._views[nav._views.length - 1].component).toEqual(MockView2); expect(nav._views[nav._views.length - 1].component).toEqual(MockView2);
@ -239,7 +239,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view1, NavDirection.forward hasCompleted, requiresTransition, view2, view1, NavDirection.Forward
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
expect(nav._views[nav._views.length - 1].component).toEqual(MockView2); expect(nav._views[nav._views.length - 1].component).toEqual(MockView2);
@ -399,7 +399,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view1, view2, NavDirection.back hasCompleted, requiresTransition, view1, view2, NavDirection.Back
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -423,7 +423,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view3, NavDirection.back hasCompleted, requiresTransition, view2, view3, NavDirection.Back
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -444,7 +444,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view4, NavDirection.back hasCompleted, requiresTransition, view2, view4, NavDirection.Back
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -502,7 +502,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view1, view4, NavDirection.back hasCompleted, requiresTransition, view1, view4, NavDirection.Back
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -562,7 +562,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view1, view4, NavDirection.back hasCompleted, requiresTransition, view1, view4, NavDirection.Back
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -765,7 +765,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view4, NavDirection.back hasCompleted, requiresTransition, view2, view4, NavDirection.Back
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -862,7 +862,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view2, view3, NavDirection.back hasCompleted, requiresTransition, view2, view3, NavDirection.Back
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView2); expect(nav.getByIndex(0).component).toEqual(MockView2);
@ -907,7 +907,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view1, view3, NavDirection.back hasCompleted, requiresTransition, view1, view3, NavDirection.Back
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView1); expect(nav.getByIndex(0).component).toEqual(MockView1);
@ -935,7 +935,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view4, view3, NavDirection.back hasCompleted, requiresTransition, view4, view3, NavDirection.Back
); );
expect(nav.length()).toEqual(1); expect(nav.length()).toEqual(1);
expect(nav.getByIndex(0).component).toEqual(MockView4); expect(nav.getByIndex(0).component).toEqual(MockView4);
@ -968,7 +968,7 @@ describe('NavController', () => {
const hasCompleted = true; const hasCompleted = true;
const requiresTransition = true; const requiresTransition = true;
expect(trnsDone).toHaveBeenCalledWith( expect(trnsDone).toHaveBeenCalledWith(
hasCompleted, requiresTransition, view5, view2, NavDirection.back hasCompleted, requiresTransition, view5, view2, NavDirection.Back
); );
expect(nav.length()).toEqual(2); expect(nav.length()).toEqual(2);
expect(nav.getByIndex(0).component).toEqual(MockView4); expect(nav.getByIndex(0).component).toEqual(MockView4);

5
core/src/components/router/router.tsx
View File

@ -5,8 +5,6 @@ import { readNavState, writeNavState } from './utils/dom';
import { chainToPath, generatePath, parsePath, readPath, writePath } from './utils/path'; import { chainToPath, generatePath, parsePath, readPath, writePath } from './utils/path';
import { RouteChain, RouteRedirect, RouterDirection, RouterEventDetail } from './utils/interfaces'; import { RouteChain, RouteRedirect, RouterDirection, RouterEventDetail } from './utils/interfaces';
import { routeRedirect, routerIDsToChain, routerPathToChain } from './utils/matching'; import { routeRedirect, routerIDsToChain, routerPathToChain } from './utils/matching';
import { printRoutes } from './utils/debug';
@Component({ @Component({
tag: 'ion-router' tag: 'ion-router'
@ -52,8 +50,7 @@ export class Router {
} }
const tree = readRoutes(this.el); const tree = readRoutes(this.el);
this.routes = flattenRouterTree(tree); this.routes = flattenRouterTree(tree);
console.debug('[ion-router] route data changed', this.routes);
printRoutes(this.routes);
// schedule write // schedule write
if (this.timer) { if (this.timer) {

2
core/src/components/router/utils/debug.ts
View File

@ -2,7 +2,7 @@ import { generatePath } from './path';
import { RouteChain } from './interfaces'; import { RouteChain } from './interfaces';
export function printRoutes(routes: RouteChain[]) { 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) { for (const chain of routes) {
const path: string[] = []; const path: string[] = [];
chain.forEach(r => path.push(...r.path)); chain.forEach(r => path.push(...r.path));