Tests for canceling navigation

rogerpadilla · May 27, 2015 · b3630e3 · b3630e3
1 parent c58bbc4
commit b3630e3
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 9 deletions.
diff --git a/dist/prouter.js b/dist/prouter.js
diff --git a/dist/prouter.js.map b/dist/prouter.js.map
diff --git a/dist/prouter.min.js b/dist/prouter.min.js
diff --git a/src/prouter.js b/src/prouter.js
diff --git a/src/prouter.js.map b/src/prouter.js.map
diff --git a/src/prouter.ts b/src/prouter.ts
@@ -703,6 +703,13 @@ export class Router {
     static history: History;
     // The previous route data.
     private _oldRouteData: NavigationData;
+    // Copy event bus functionality.
+    /* tslint:disable:no-unused-variable */
+    private _eventHandlers: EventHandler = {};
+    /* tslint:enable:no-unused-variable */
+    trigger = History.prototype.trigger;
+    on = History.prototype.on;
+    off = History.prototype.off;
 
     /**
      * Constructor for the router.
@@ -752,6 +759,12 @@ export class Router {
                 return;
             }
 
+            next = this.trigger('route:before', newRouteData, this._oldRouteData);
+
+            if (next === false) {
+                return;
+            }
+
             if (this._oldRouteData && this._oldRouteData.handler.deactivate) {
                 next = this._oldRouteData.handler.deactivate.call(this._oldRouteData.handler, newRouteData, this._oldRouteData);
                 if (next === false) {

diff --git a/test/router.spec.js b/test/router.spec.js
@@ -263,23 +263,39 @@
         });
     });
 
-    test('routes cancel navigation', 2, function() {
+    test('cancel navigation', 2, function() {
         var router = new Router([{
             route: 'something',
-            activate: function(newRouteData) {
+            activate: function() {
+                ok(false);
+            }
+        }, {
+            route: 'other',
+            activate: function() {
                 ok(false);
             }
         }]);
         Router.history.on('route:before', function(router, newNavigationData, oldNavigationData) {
-            strictEqual(router, router);
-            equal(newNavigationData.path, 'something');
-            return false;
+            if (newNavigationData.path === 'something') {
+                strictEqual(router, router);
+                return false;
+            }
         });
         Router.history.on('route:after', function(router, newNavigationData, oldNavigationData) {
-            ok(false);
+            notEqual(newNavigationData.path, 'something');
+        });
+        router.on('route:before', function(newNavigationData, oldNavigationData) {
+            notEqual(newNavigationData.path, 'something');
+            if (newNavigationData.path === 'other') {
+                return false;
+            }
+        });
+        router.on('route:after', function(newNavigationData, oldNavigationData) {
+            notEqual(newNavigationData.path, 'other');
         });
         Router.history.start();
         Router.history.navigate('something');
+        Router.history.navigate('other');
     });
 
     test('activate / deactivate callbacks', 9, function() {