fixup! fix($rootScope): provide correct value of one-time bindings in watchGroup

Author: jbedard

test/ng/rootScopeSpec.js

@@ -1114,34 +1114,34 @@ describe('Scope', function() {
       expect(scope.$$watchersCount).toBe(0);
     });
 
-    it('should maintain correct new/old values with one time bindings', inject(function($rootScope, $exceptionHandler) {
+    it('should maintain correct new/old values with one time bindings', function() {
       var newValues;
       var oldValues;
-      $rootScope.$watchGroup(['a', '::b', 'b', '4'], function(n, o) {
+      scope.$watchGroup(['a', '::b', 'b', '4'], function(n, o) {
         newValues = n.slice();
         oldValues = o.slice();
       });
 
-      $rootScope.$apply();
+      scope.$apply();
       expect(newValues).toEqual(oldValues);
       expect(oldValues).toEqual([undefined, undefined, undefined, 4]);
 
-      $rootScope.$apply('a = 1');
+      scope.$apply('a = 1');
       expect(newValues).toEqual([1, undefined, undefined, 4]);
       expect(oldValues).toEqual([undefined, undefined, undefined, 4]);
 
-      $rootScope.$apply('b = 2');
+      scope.$apply('b = 2');
       expect(newValues).toEqual([1, 2, 2, 4]);
       expect(oldValues).toEqual([1, undefined, undefined, 4]);
 
-      $rootScope.$apply('b = 3');
+      scope.$apply('b = 3');
       expect(newValues).toEqual([1, 2, 3, 4]);
       expect(oldValues).toEqual([1, 2, 2, 4]);
 
-      $rootScope.$apply('b = 4');
+      scope.$apply('b = 4');
       expect(newValues).toEqual([1, 2, 4, 4]);
       expect(oldValues).toEqual([1, 2, 3, 4]);
-    }));
+    });
   });
 
   describe('$watchGroup with logging $exceptionHandler', function() {
@@ -1150,36 +1150,36 @@ describe('Scope', function() {
         $exceptionHandlerProvider.mode('log');
       });
 
-      inject(function($rootScope, $exceptionHandler) {
+      inject(function($exceptionHandler) {
         var newValues;
         var oldValues;
-        $rootScope.$watchGroup(['a', '::b', 'b', '4'], function(n, o) {
+        scope.$watchGroup(['a', '::b', 'b', '4'], function(n, o) {
           newValues = n.slice();
           oldValues = o.slice();
           throw 'test';
         });
 
-        $rootScope.$apply();
+        scope.$apply();
         expect(newValues).toEqual(oldValues);
         expect(oldValues).toEqual([undefined, undefined, undefined, 4]);
         expect($exceptionHandler.errors.length).toBe(1);
 
-        $rootScope.$apply('a = 1');
+        scope.$apply('a = 1');
         expect(newValues).toEqual([1, undefined, undefined, 4]);
         expect(oldValues).toEqual([undefined, undefined, undefined, 4]);
         expect($exceptionHandler.errors.length).toBe(2);
 
-        $rootScope.$apply('b = 2');
+        scope.$apply('b = 2');
         expect(newValues).toEqual([1, 2, 2, 4]);
         expect(oldValues).toEqual([1, undefined, undefined, 4]);
         expect($exceptionHandler.errors.length).toBe(3);
 
-        $rootScope.$apply('b = 3');
+        scope.$apply('b = 3');
         expect(newValues).toEqual([1, 2, 3, 4]);
         expect(oldValues).toEqual([1, 2, 2, 4]);
         expect($exceptionHandler.errors.length).toBe(4);
 
-        $rootScope.$apply('b = 4');
+        scope.$apply('b = 4');
         expect(newValues).toEqual([1, 2, 4, 4]);
         expect(oldValues).toEqual([1, 2, 3, 4]);
         expect($exceptionHandler.errors.length).toBe(5);