|
1 | 1 | 'use strict';
|
2 | 2 |
|
3 |
| -fdescribe('$route', function() { |
| 3 | +describe('$route', function() { |
4 | 4 | var $httpBackend,
|
5 | 5 | element;
|
6 | 6 |
|
@@ -1062,30 +1062,39 @@ fdescribe('$route', function() {
|
1062 | 1062 | });
|
1063 | 1063 | });
|
1064 | 1064 |
|
1065 |
| - it('should not instantiate controller or process template for a redirected route', function() { |
| 1065 | + it('should not process route bits', function() { |
1066 | 1066 | var firstController = jasmine.createSpy('first controller spy');
|
1067 | 1067 | var firstTemplate = jasmine.createSpy('first template spy').and.returnValue('redirected view');
|
| 1068 | + var firstResolve = jasmine.createSpy('first resolve spy'); |
1068 | 1069 | var secondController = jasmine.createSpy('second controller spy');
|
1069 | 1070 | var secondTemplate = jasmine.createSpy('second template spy').and.returnValue('redirected view');
|
| 1071 | + var secondResolve = jasmine.createSpy('second resolve spy'); |
1070 | 1072 | module(function($routeProvider) {
|
1071 | 1073 | $routeProvider.when('/redirect', {
|
1072 | 1074 | template: firstTemplate,
|
1073 | 1075 | redirectTo: '/redirected',
|
| 1076 | + resolve: { value: firstResolve }, |
1074 | 1077 | controller: firstController
|
1075 | 1078 | });
|
1076 | 1079 | $routeProvider.when('/redirected', {
|
1077 | 1080 | template: secondTemplate,
|
| 1081 | + resolve: { value: secondResolve }, |
1078 | 1082 | controller: secondController
|
1079 | 1083 | });
|
1080 | 1084 | });
|
1081 | 1085 | inject(function($route, $location, $rootScope, $compile) {
|
1082 | 1086 | var element = $compile('<div><ng-view></ng-view></div>')($rootScope);
|
1083 | 1087 | $location.path('/redirect');
|
1084 | 1088 | $rootScope.$digest();
|
| 1089 | + |
1085 | 1090 | expect(firstController).not.toHaveBeenCalled();
|
1086 | 1091 | expect(firstTemplate).not.toHaveBeenCalled();
|
| 1092 | + expect(firstResolve).not.toHaveBeenCalled(); |
| 1093 | + |
1087 | 1094 | expect(secondController).toHaveBeenCalled();
|
1088 | 1095 | expect(secondTemplate).toHaveBeenCalled();
|
| 1096 | + expect(secondResolve).toHaveBeenCalled(); |
| 1097 | + |
1089 | 1098 | dealoc(element);
|
1090 | 1099 | });
|
1091 | 1100 | });
|
|
0 commit comments