diff options
| author | Igor Minar | 2014-01-13 15:12:17 -0800 | 
|---|---|---|
| committer | Igor Minar | 2014-01-13 15:12:17 -0800 | 
| commit | 308598795af75c33a966ecb3124f4a640d72458d (patch) | |
| tree | 8caff12f77643830dce0c1bbd9d6924013a0deb4 /test | |
| parent | 2cd09c9f0e7766bcd191662841b7b1ffc3b6dc3f (diff) | |
| download | angular.js-308598795af75c33a966ecb3124f4a640d72458d.tar.bz2 | |
revert: fix($route): update current route upon $route instantiation
This reverts commit 2b344dbd20777fb1283b3a5bcf35a6ae8d09469d.
I think I merged this commit prematurely and in addition to that
we found out that it's breaking google apps.
Jen Bourey will provide more info at the original PR #5681
Diffstat (limited to 'test')
| -rw-r--r-- | test/ngRoute/routeSpec.js | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/test/ngRoute/routeSpec.js b/test/ngRoute/routeSpec.js index 52484116..de7ccb8d 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).not.toBeUndefined(); +        expect($route.current).toBeUndefined();          expect(onChangeSpy).not.toHaveBeenCalled();          $location.path('/unknownRoute'); @@ -426,7 +426,7 @@ describe('$route', function() {          // init          $rootScope.$on('$routeChangeStart', onChangeSpy); -        expect($route.current).not.toBeUndefined(); +        expect($route.current).toBeUndefined();          expect(onChangeSpy).not.toHaveBeenCalled(); @@ -434,7 +434,7 @@ describe('$route', function() {          $location.path('/unknownRoute');          $rootScope.$digest(); -        expect(currentRoute).not.toBeUndefined(); +        expect(currentRoute).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).not.toBeUndefined(); +        expect($route.current).toBeUndefined();          expect(onChangeSpy).not.toHaveBeenCalled();          $location.path('/'); | 
