fix(modules): stop leaking global variables in tests

The routeUtils.js file was declaring a number of functions that were
leaking into other modules such as ngMocks causing tests to pass
incorrectly.

Closes #4360

1 files changed, 12 insertions, 12 deletions

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) {