From 2b344dbd20777fb1283b3a5bcf35a6ae8d09469d Mon Sep 17 00:00:00 2001 From: Daniel Zimmermann Date: Wed, 8 Jan 2014 19:58:09 +1100 Subject: fix($route): update current route upon $route instantiation This fixes cases where the first ngView is loaded in a template asynchronously (such as through ngInclude), as the service will miss the first event otherwise. Closes #4957 --- test/ngRoute/routeSpec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/ngRoute/routeSpec.js b/test/ngRoute/routeSpec.js index de7ccb8d..52484116 100644 --- a/test/ngRoute/routeSpec.js +++ b/test/ngRoute/routeSpec.js @@ -389,7 +389,7 @@ describe('$route', function() { var onChangeSpy = jasmine.createSpy('onChange'); $rootScope.$on('$routeChangeStart', onChangeSpy); - expect($route.current).toBeUndefined(); + expect($route.current).not.toBeUndefined(); expect(onChangeSpy).not.toHaveBeenCalled(); $location.path('/unknownRoute'); @@ -426,7 +426,7 @@ describe('$route', function() { // init $rootScope.$on('$routeChangeStart', onChangeSpy); - expect($route.current).toBeUndefined(); + expect($route.current).not.toBeUndefined(); expect(onChangeSpy).not.toHaveBeenCalled(); @@ -434,7 +434,7 @@ describe('$route', function() { $location.path('/unknownRoute'); $rootScope.$digest(); - expect(currentRoute).toBeUndefined(); + expect(currentRoute).not.toBeUndefined(); expect(nextRoute.templateUrl).toBe('404.html'); expect($route.current.templateUrl).toBe('404.html'); expect(onChangeSpy).toHaveBeenCalled(); @@ -770,7 +770,7 @@ describe('$route', function() { var onChangeSpy = jasmine.createSpy('onChange'); $rootScope.$on('$routeChangeStart', onChangeSpy); - expect($route.current).toBeUndefined(); + expect($route.current).not.toBeUndefined(); expect(onChangeSpy).not.toHaveBeenCalled(); $location.path('/'); -- cgit v1.2.3