From 1de04b23b1819c451b235b1a8dc8aad8a93ee46c Mon Sep 17 00:00:00 2001
From: Austin Miller <armiller@google.com>
Date: Mon, 31 Oct 2016 13:11:36 -0700
Subject: [PATCH] fix(router): call data observers when the path changes

---
 modules/@angular/router/src/router_state.ts   |  4 ++-
 .../@angular/router/test/router_state.spec.ts | 35 +++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/modules/@angular/router/src/router_state.ts b/modules/@angular/router/src/router_state.ts
index 832c1fc0f9..929535d71d 100644
--- a/modules/@angular/router/src/router_state.ts
+++ b/modules/@angular/router/src/router_state.ts
@@ -435,11 +435,13 @@ export function advanceActivatedRoute(route: ActivatedRoute): void {
     }
     if (!shallowEqual(route.snapshot.params, route._futureSnapshot.params)) {
       (<any>route.params).next(route._futureSnapshot.params);
-      (<any>route.data).next(route._futureSnapshot.data);
     }
     if (!shallowEqualArrays(route.snapshot.url, route._futureSnapshot.url)) {
       (<any>route.url).next(route._futureSnapshot.url);
     }
+    if (!equalParamsAndUrlSegments(route.snapshot, route._futureSnapshot)) {
+      (<any>route.data).next(route._futureSnapshot.data);
+    }
     route.snapshot = route._futureSnapshot;
   } else {
     route.snapshot = route._futureSnapshot;
diff --git a/modules/@angular/router/test/router_state.spec.ts b/modules/@angular/router/test/router_state.spec.ts
index ec9677c2fd..1076629b02 100644
--- a/modules/@angular/router/test/router_state.spec.ts
+++ b/modules/@angular/router/test/router_state.spec.ts
@@ -6,7 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ActivatedRoute, ActivatedRouteSnapshot, RouterState, RouterStateSnapshot, equalParamsAndUrlSegments} from '../src/router_state';
+import {BehaviorSubject} from 'rxjs/BehaviorSubject';
+
+import {ActivatedRoute, ActivatedRouteSnapshot, RouterState, RouterStateSnapshot, advanceActivatedRoute, equalParamsAndUrlSegments} from '../src/router_state';
 import {Params} from '../src/shared';
 import {UrlSegment} from '../src/url_tree';
 import {TreeNode} from '../src/utils/tree';
@@ -122,6 +124,34 @@ describe('RouterState & Snapshot', () => {
           .toEqual(true);
     });
   });
+
+  describe('advanceActivatedRoute', () => {
+
+    let route: ActivatedRoute;
+
+    beforeEach(() => { route = createActivatedRoute('a'); });
+
+    function createSnapshot(params: Params, url: UrlSegment[]): ActivatedRouteSnapshot {
+      const queryParams = {};
+      const fragment = '';
+      const data = {};
+      return new ActivatedRouteSnapshot(
+          url, params, queryParams, fragment, data, <any>null, <any>null, <any>null, <any>null, -1,
+          null);
+    }
+
+    it('should call change observers', () => {
+      const firstPlace = createSnapshot({a: 1}, []);
+      const secondPlace = createSnapshot({a: 2}, []);
+      route.snapshot = firstPlace;
+      route._futureSnapshot = secondPlace;
+
+      let hasSeenDataChange = false;
+      route.data.forEach((data) => { hasSeenDataChange = true; });
+      advanceActivatedRoute(route);
+      expect(hasSeenDataChange).toEqual(true);
+    });
+  });
 });
 
 function createActivatedRouteSnapshot(cmp: string) {
@@ -132,5 +162,6 @@ function createActivatedRouteSnapshot(cmp: string) {
 
 function createActivatedRoute(cmp: string) {
   return new ActivatedRoute(
-      <any>null, <any>null, <any>null, <any>null, <any>null, <any>null, <any>cmp, <any>null);
+      new BehaviorSubject([new UrlSegment('', {})]), new BehaviorSubject({}), <any>null, <any>null,
+      new BehaviorSubject({}), <any>null, <any>cmp, <any>null);
 }