7222eae fix(router): canDeactivate should not change the url when returns false

vsavkin · vsavkin · commit 5124ce6c944f · 2016-04-30T18:07:24.000Z
diff --git a/BUILD_INFO b/BUILD_INFO
@@ -1,2 +1,2 @@
-Sat Apr 30 17:32:09 UTC 2016
-0f1b37011794bd4aa9edd58cd6ab7781c807a095
+Sat Apr 30 18:07:24 UTC 2016
+7222eae20c90c767d59178e90119342e27721189
diff --git a/lib/src/alt_router/router.dart b/lib/src/alt_router/router.dart
@@ -68,10 +68,12 @@ class Router {
         .then((currTree) {
       return new _LoadSegments(currTree, this._prevTree)
           .load(this._routerOutletMap, this._rootComponent)
-          .then((_) {
-        this._prevTree = currTree;
-        this._location.go(this._urlSerializer.serialize(this._urlTree));
-        this._changes.emit(null);
+          .then((updated) {
+        if (updated) {
+          this._prevTree = currTree;
+          this._location.go(this._urlSerializer.serialize(this._urlTree));
+          this._changes.emit(null);
+        }
       });
     });
   }
@@ -105,7 +107,7 @@ class _LoadSegments {
   List<List<Object>> deactivations = [];
   bool performMutation = true;
   _LoadSegments(this.currTree, this.prevTree) {}
-  Future load(RouterOutletMap parentOutletMap, Object rootComponent) {
+  Future<bool> load(RouterOutletMap parentOutletMap, Object rootComponent) {
     var prevRoot = isPresent(this.prevTree) ? rootNode(this.prevTree) : null;
     var currRoot = rootNode(this.currTree);
     return this
@@ -116,6 +118,7 @@ class _LoadSegments {
         this.loadChildSegments(
             currRoot, prevRoot, parentOutletMap, [rootComponent]);
       }
+      return res;
     });
   }
 
@@ -217,7 +220,7 @@ class _LoadSegments {
   }
 
   void unloadOutlet(RouterOutlet outlet, List<Object> components) {
-    if (outlet.isLoaded) {
+    if (isPresent(outlet) && outlet.isLoaded) {
       StringMapWrapper.forEach(outlet.outletMap._outlets,
           (v, k) => this.unloadOutlet(v, components));
       if (this.performMutation) {
diff --git a/test/alt_router/integration_spec.dart b/test/alt_router/integration_spec.dart
@@ -121,14 +121,16 @@ main() {
         })));
     it(
         "should not unload the route if can deactivate returns false",
-        fakeAsync(inject([Router, TestComponentBuilder], (router, tcb) {
+        fakeAsync(inject([Router, TestComponentBuilder, Location],
+            (router, tcb, location) {
           var fixture = tcb.createFakeAsync(RootCmp);
           router.navigateByUrl("/team/22/cannotDeactivate");
           advance(fixture);
           router.navigateByUrl("/team/22/user/fedor");
           advance(fixture);
           expect(fixture.debugElement.nativeElement)
               .toHaveText("team 22 { cannotDeactivate, aux:  }");
+          expect(location.path()).toEqual("/team/22/cannotDeactivate");
         })));
     if (DOM.supportsDOMEvents()) {
       it(
