$watchSet changes. TODO squash

Author: rodyhaddad

src/ng/rootScope.js

@@ -383,30 +383,23 @@ function $RootScopeProvider(){
       $watchSet: function (watchExpressions, listener) {
         if (watchExpressions.length === 0) return noop;
 
-        var oldValues = new Array(watchExpressions.length),
+        var self = this,
+            oldValues = new Array(watchExpressions.length),
             newValues = new Array(watchExpressions.length);
 
-        if (watchExpressions.length === 1) {
-          // Special case size of one
-          return this.$watch(watchExpressions[0], function (value, oldValue, scope) {
-            newValues[0] = value;
-            oldValues[0] = oldValue;
-            listener.call(this, newValues, oldValues, scope);
-          });
-        }
         var deregisterFns = [],
             changeCount = 0;
 
         forEach(watchExpressions, function (expr, i) {
-          deregisterFns.push(this.$watch(expr, function (value, oldValue) {
+          deregisterFns.push(self.$watch(expr, function (value, oldValue) {
             newValues[i] = value;
             oldValues[i] = oldValue;
             changeCount++;
           }));
-        }, this);
+        });
 
-        deregisterFns.push(this.$watch(function () {return changeCount;}, function (c, o, scope) {
-          listener.call(this, newValues, oldValues, scope);
+        deregisterFns.push(this.$watch(function () {return changeCount;}, function () {
+          listener.call(this, newValues, oldValues, self);
         }));
 
         return function () {

test/ng/rootScopeSpec.js

@@ -734,74 +734,54 @@ describe('Scope', function() {
   });
 
   describe('$watchSet', function() {
-    var scope;
-    beforeEach(inject(function($rootScope) {
-      scope = $rootScope.$new();
-    }));
-
-    it('should skip empty sets', function() {
-      expect(scope.$watchSet([], null)()).toBeUndefined();
-    });
 
-    it('should treat set of 1 as direct watch', function() {
-      var lastValues = ['foo'];
-      var log = '';
-      var clean = scope.$watchSet(['a'], function(values, oldValues, s) {
-        log += values.join(',') + ';';
-        expect(s).toBe(scope);
-        expect(oldValues).toEqual(lastValues);
-        lastValues = values.slice();
+    it('should detect a change to any expression in the array', inject(function($rootScope, log) {
+      $rootScope.$watchSet(['a', 'b'], function(values, oldValues, scope) {
+        expect(scope).toBe($rootScope);
+        log(values + '-' + oldValues);
       });
 
-      scope.a = 'foo';
-      scope.$digest();
-      expect(log).toEqual('foo;');
-
-      scope.$digest();
-      expect(log).toEqual('foo;');
-
-      scope.a = 'bar';
-      scope.$digest();
-      expect(log).toEqual('foo;bar;');
+      $rootScope.a = 'foo';
+      $rootScope.b = 'bar';
+      $rootScope.$digest();
+      expect(log).toEqual('foo,bar-foo,bar');
 
-      clean();
-      scope.a = 'xxx';
-      scope.$digest();
-      expect(log).toEqual('foo;bar;');
-    });
+      log.reset();
+      $rootScope.$digest();
+      expect(log).toEqual('');
 
-    it('should detect a change to any one in a set', function() {
-      var lastValues = ['foo', 'bar'];
-      var log = '';
-      var clean = scope.$watchSet(['a', 'b'], function(values, oldValues, s) {
-        log += values.join(',') + ';';
-        expect(s).toBe(scope);
-        expect(oldValues).toEqual(lastValues);
-        lastValues = values.slice();
-      });
+      log.reset();
+      $rootScope.a = 'a';
+      $rootScope.$digest();
+      expect(log).toEqual('a,bar-foo,bar');
 
-      scope.a = 'foo';
-      scope.b = 'bar';
-      scope.$digest();
-      expect(log).toEqual('foo,bar;');
+      log.reset();
+      $rootScope.a = 'A';
+      $rootScope.b = 'B';
+      $rootScope.$digest();
+      expect(log).toEqual('A,B-a,bar');
+    }));
 
-      scope.$digest();
-      expect(log).toEqual('foo,bar;');
+    it('should return a function that allows listeners to be deregistered', inject(function($rootScope) {
+        var listener = jasmine.createSpy('watchSet listener'),
+          listenerRemove;
 
-      scope.a = 'a';
-      scope.$digest();
-      expect(log).toEqual('foo,bar;a,bar;');
+        listenerRemove = $rootScope.$watchSet(['a'], listener);
+        $rootScope.$digest(); //init
+        expect(listener).toHaveBeenCalled();
+        expect(listenerRemove).toBeDefined();
 
-      scope.a = 'A';
-      scope.b = 'B';
-      scope.$digest();
-      expect(log).toEqual('foo,bar;a,bar;A,B;');
+        listener.reset();
+        $rootScope.a = 'bar';
+        $rootScope.$digest(); //trigger
+        expect(listener).toHaveBeenCalledOnce();
 
-      clean();
-      scope.a = 'xxx';
-      scope.$digest();
-      expect(log).toEqual('foo,bar;a,bar;A,B;');
-    });
+        listener.reset();
+        $rootScope.a = 'baz';
+        listenerRemove();
+        $rootScope.$digest(); //trigger
+        expect(listener).not.toHaveBeenCalled();
+      }));
   });
 
   describe('$destroy', function() {