diff options
Diffstat (limited to 'test/ngRoute')
| -rw-r--r-- | test/ngRoute/directive/ngViewSpec.js | 22 | ||||
| -rw-r--r-- | test/ngRoute/routeSpec.js | 24 |
2 files changed, 23 insertions, 23 deletions
diff --git a/test/ngRoute/directive/ngViewSpec.js b/test/ngRoute/directive/ngViewSpec.js index d38b3ba9..2d74760c 100644 --- a/test/ngRoute/directive/ngViewSpec.js +++ b/test/ngRoute/directive/ngViewSpec.js @@ -279,7 +279,7 @@ describe('ngView', function() { it('should be async even if served from cache', function() { module(function($routeProvider) { - $routeProvider.when('/foo', {controller: noop, templateUrl: 'myUrl1'}); + $routeProvider.when('/foo', {controller: angular.noop, templateUrl: 'myUrl1'}); }); inject(function($route, $rootScope, $location, $templateCache) { @@ -498,16 +498,16 @@ describe('ngView', function() { $location.url('/foo'); $rootScope.$digest(); - forEach(element.contents(), function(node) { + angular.forEach(element.contents(), function(node) { if(node.nodeType == 3 /* text node */) { - expect(jqLite(node).scope()).not.toBe($route.current.scope); - expect(jqLite(node).controller()).not.toBeDefined(); + expect(angular.element(node).scope()).not.toBe($route.current.scope); + expect(angular.element(node).controller()).not.toBeDefined(); } else if(node.nodeType == 8 /* comment node */) { - expect(jqLite(node).scope()).toBe(element.scope()); - expect(jqLite(node).controller()).toBe(element.controller()); + expect(angular.element(node).scope()).toBe(element.scope()); + expect(angular.element(node).controller()).toBe(element.controller()); } else { - expect(jqLite(node).scope()).toBe($route.current.scope); - expect(jqLite(node).controller()).toBeDefined(); + expect(angular.element(node).scope()).toBe($route.current.scope); + expect(angular.element(node).controller()).toBeDefined(); } }); }); @@ -530,7 +530,7 @@ describe('ngView animations', function() { // we need to run animation on attached elements; return function(_$rootElement_) { $rootElement = _$rootElement_; - body = jqLite(document.body); + body = angular.element(document.body); }; })); @@ -541,8 +541,8 @@ describe('ngView animations', function() { beforeEach(module(function($provide, $routeProvider) { - $routeProvider.when('/foo', {controller: noop, templateUrl: '/foo.html'}); - $routeProvider.when('/bar', {controller: noop, templateUrl: '/bar.html'}); + $routeProvider.when('/foo', {controller: angular.noop, templateUrl: '/foo.html'}); + $routeProvider.when('/bar', {controller: angular.noop, templateUrl: '/bar.html'}); return function($templateCache) { $templateCache.put('/foo.html', [200, '<div>data</div>', {}]); $templateCache.put('/bar.html', [200, '<div>data2</div>', {}]); diff --git a/test/ngRoute/routeSpec.js b/test/ngRoute/routeSpec.js index bd7966e1..de7ccb8d 100644 --- a/test/ngRoute/routeSpec.js +++ b/test/ngRoute/routeSpec.js @@ -25,7 +25,7 @@ describe('$route', function() { module(function($routeProvider) { $routeProvider.when('/Book/:book/Chapter/:chapter', - {controller: noop, templateUrl: 'Chapter.html'}); + {controller: angular.noop, templateUrl: 'Chapter.html'}); $routeProvider.when('/Blank', {}); }); inject(function($route, $location, $rootScope) { @@ -69,9 +69,9 @@ describe('$route', function() { module(function($routeProvider) { $routeProvider.when('/Book1/:book/Chapter/:chapter/:highlight*/edit', - {controller: noop, templateUrl: 'Chapter.html'}); + {controller: angular.noop, templateUrl: 'Chapter.html'}); $routeProvider.when('/Book2/:book/:highlight*/Chapter/:chapter', - {controller: noop, templateUrl: 'Chapter.html'}); + {controller: angular.noop, templateUrl: 'Chapter.html'}); $routeProvider.when('/Blank', {}); }); inject(function($route, $location, $rootScope) { @@ -128,9 +128,9 @@ describe('$route', function() { module(function($routeProvider) { $routeProvider.when('/Book1/:book/Chapter/:chapter/:highlight*/edit', - {controller: noop, templateUrl: 'Chapter.html', caseInsensitiveMatch: true}); + {controller: angular.noop, templateUrl: 'Chapter.html', caseInsensitiveMatch: true}); $routeProvider.when('/Book2/:book/:highlight*/Chapter/:chapter', - {controller: noop, templateUrl: 'Chapter.html'}); + {controller: angular.noop, templateUrl: 'Chapter.html'}); $routeProvider.when('/Blank', {}); }); inject(function($route, $location, $rootScope) { @@ -618,8 +618,8 @@ describe('$route', function() { inject(function($route, $httpBackend, $location, $rootScope, $routeParams) { var log = ''; - $rootScope.$on('$routeChangeStart', function(e, next) { log += '$before' + toJson($routeParams) + ';'}); - $rootScope.$on('$routeChangeSuccess', function(e, next) { log += '$after' + toJson($routeParams) + ';'}); + $rootScope.$on('$routeChangeStart', function(e, next) { log += '$before' + angular.toJson($routeParams) + ';'}); + $rootScope.$on('$routeChangeSuccess', function(e, next) { log += '$after' + angular.toJson($routeParams) + ';'}); $httpBackend.whenGET('r1.html').respond('R1'); $httpBackend.whenGET('r2.html').respond('R2'); @@ -876,7 +876,7 @@ describe('$route', function() { var reloaded = jasmine.createSpy('route reload'); module(function($routeProvider) { - $routeProvider.when('/foo', {controller: noop}); + $routeProvider.when('/foo', {controller: angular.noop}); }); inject(function($route, $location, $rootScope, $routeParams) { @@ -901,7 +901,7 @@ describe('$route', function() { routeUpdate = jasmine.createSpy('route update'); module(function($routeProvider) { - $routeProvider.when('/foo', {controller: noop, reloadOnSearch: false}); + $routeProvider.when('/foo', {controller: angular.noop, reloadOnSearch: false}); }); inject(function($route, $location, $rootScope) { @@ -931,7 +931,7 @@ describe('$route', function() { var routeChange = jasmine.createSpy('route change'); module(function($routeProvider) { - $routeProvider.when('/foo/:fooId', {controller: noop, reloadOnSearch: false}); + $routeProvider.when('/foo/:fooId', {controller: angular.noop, reloadOnSearch: false}); }); inject(function($route, $location, $rootScope) { @@ -963,8 +963,8 @@ describe('$route', function() { var routeParamsWatcher = jasmine.createSpy('routeParamsWatcher'); module(function($routeProvider) { - $routeProvider.when('/foo', {controller: noop}); - $routeProvider.when('/bar/:barId', {controller: noop, reloadOnSearch: false}); + $routeProvider.when('/foo', {controller: angular.noop}); + $routeProvider.when('/bar/:barId', {controller: angular.noop, reloadOnSearch: false}); }); inject(function($route, $location, $rootScope, $routeParams) { |