fix(navcontroller): lazy loading is queued

Author: manucorporat

scripts/gulp/tasks/test.ts

@@ -85,6 +85,7 @@ function karmaTest(watch: boolean, done: Function) {
 
   let karmaConfig = {
     configFile: join(SCRIPTS_ROOT, 'karma/karma.conf.js'),
+    singleRun: true,
   };
 
   if (watch) {
@@ -96,6 +97,9 @@ function karmaTest(watch: boolean, done: Function) {
       args: ['--grep', argv.testGrep]
     };
   }
+  if (typeof argv.debug !== 'undefined') {
+    karmaConfig.singleRun = false;
+  }
 
   new karma.Server(karmaConfig, done).start();
 }

scripts/karma/system.config.js

@@ -4,7 +4,7 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000;
 
 // disable console debugs/errors/warns from printing out
 console.debug = () => {};
-console.error = () => {};
+// console.error = () => {};
 console.warn = () => {};
 
 __karma__.loaded = function () {};

src/animations/animation.ts

@@ -103,6 +103,13 @@ export class Animation {
     return 0;
   }
 
+  /**
+   * Returns if the animation is a root one.
+   */
+  isRoot(): boolean {
+    return !this.parent;
+  }
+
   /**
    * Set the duration for this animation.
    */

src/components/app/test/app.spec.ts

@@ -167,8 +167,9 @@ describe('App', () => {
         expect(plt.exitApp).not.toHaveBeenCalled();
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
-      });
+        });
     });
 
     it('should pop the second view in the root nav', () => {

src/components/nav/test/basic/pages/first-page/first-page.html

@@ -42,7 +42,7 @@
         </ion-item>
         <ion-item>
           <ion-label>Toggle Can Leave</ion-label>
-          <ion-toggle (click)="canLeave = !canLeave"></ion-toggle>
+          <ion-toggle [(ngModel)]="canLeave"></ion-toggle>
         </ion-item>
         <button ion-item (click)="viewDismiss()">View Dismiss</button>
         <button ion-item (click)="quickPush()">New push during transition</button>

src/components/nav/test/nav.spec.ts

@@ -34,6 +34,7 @@ describe('Nav', () => {
         expect(nav.setPages).toHaveBeenCalledWith(knownViews, null, null);
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });
@@ -56,6 +57,7 @@ describe('Nav', () => {
         expect(nav.setPages).toHaveBeenCalledWith(knownViews, null, null);
         done();
       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });
@@ -72,7 +74,8 @@ describe('Nav', () => {
        promise.then(() => {
         expect(nav.push).toHaveBeenCalled();
         done();
-      }).catch((err: Error) => {
+       }).catch((err: Error) => {
+        fail(err);
         done(err);
       });
     });

src/components/tabs/tab.ts

@@ -292,7 +292,7 @@ export class Tab extends NavControllerBase {
   /**
    * @hidden
    */
-  load(opts: NavOptions, done?: Function) {
+  load(opts: NavOptions, done?: () => void) {
     if (!this._loaded && this.root) {
       this.setElementClass('show-tab', true);
       this.push(this.root, this.rootParams, opts, done);
@@ -305,7 +305,7 @@ export class Tab extends NavControllerBase {
       this._dom.read(() => {
         this.resize();
       });
-      done(true);
+      done();
     }
   }
 

src/components/tabs/test/tabs.spec.ts

@@ -162,7 +162,6 @@ describe('Tabs', () => {
     it('should get the tab', () => {
       var tabs = mockTabs();
       var tab0 = mockTab(tabs);
-      tab0.setRoot(<any>{});
       var tab1 = mockTab(tabs);
 
       expect(tabs.getIndex(tab0)).toEqual(0);