WIP: test fixes

Author: IgorMinar

test/ng/parseSpec.js

@@ -1309,7 +1309,7 @@ describe('parser', function() {
 
         it('should respect short-circuiting AND if it could have side effects', function() {
           var bCalled = 0;
-          scope.b = function() { bCalled++; }
+          scope.b = function() { bCalled++; };
 
           scope.$watch("a && b()");
           scope.$digest();
@@ -1325,7 +1325,7 @@ describe('parser', function() {
 
         it('should respect short-circuiting OR if it could have side effects', function() {
           var bCalled = false;
-          scope.b = function() { bCalled = true; }
+          scope.b = function() { bCalled = true; };
 
           scope.$watch("a || b()");
           scope.$digest();
@@ -1408,42 +1408,72 @@ describe('parser', function() {
           expect(called).toBe(true);
         }));
 
-        it('should invoke interceptorFns if the yare marked as having externalInput', inject(function($parse) {
-          var called = false;
-          function interceptor() {
-            called = true;
-          }
-          interceptor.externalInput = true;
+        it('should treat filters with constant input as constants', inject(function($parse) {
+          var filterCalls = 0;
+          $filterProvider.register('foo', valueFn(function(input) {
+            filterCalls++;
+            return input;
+          }));
 
-          scope.$watch($parse("a", interceptor));
-          scope.a = 0;
-          scope.$digest();
-          expect(called).toBe(true);
+          var parsed = $parse('{x: 1} | foo:1');
+
+          expect(parsed.constant).toBe(true);
+
+          var watcherCalls = 0;
+          scope.$watch(parsed, function(input) {
+            expect(input).toEqual({x:1});
+            watcherCalls++;
+          });
 
-          called = false;
           scope.$digest();
-          expect(called).toBe(true);
+          expect(filterCalls).toBe(1);
+          expect(watcherCalls).toBe(1);
 
-          scope.a++;
-          called = false;
           scope.$digest();
-          expect(called).toBe(true);
+          expect(filterCalls).toBe(1);
+          expect(watcherCalls).toBe(1);
         }));
 
-        it('should treat filters with constant input as constants', inject(function($parse) {
+        it("should always reevaluate filters with non-primitive input that doesn't support valueOf()",
+            inject(function($parse) {
           var filterCalls = 0;
           $filterProvider.register('foo', valueFn(function(input) {
             filterCalls++;
             return input;
           }));
 
-          var parsed = $parse('{x: 1} | foo:1');
+          var parsed = $parse('obj | foo');
+          var obj = scope.obj = {};
 
-          expect(parsed.constant).toBe(true);
+          var watcherCalls = 0;
+          scope.$watch(parsed, function(input) {
+            expect(input).toBe(obj);
+            watcherCalls++;
+          });
+
+          scope.$digest();
+          expect(filterCalls).toBe(2);
+          expect(watcherCalls).toBe(1);
+
+          scope.$digest();
+          expect(filterCalls).toBe(3);
+          expect(watcherCalls).toBe(1);
+        }));
+
+        it("should not reevaluate filters with non-primitive input that does support valueOf()",
+            inject(function($parse) {
+          var filterCalls = 0;
+          $filterProvider.register('foo', valueFn(function(input) {
+            filterCalls++;
+            return input;
+          }));
+
+          var parsed = $parse('date | foo');
+          var date = scope.date = new Date();
 
           var watcherCalls = 0;
           scope.$watch(parsed, function(input) {
-            expect(input).toEqual({x:1});
+            expect(input).toBe(date);
             watcherCalls++;
           });
 
@@ -1455,6 +1485,29 @@ describe('parser', function() {
           expect(filterCalls).toBe(1);
           expect(watcherCalls).toBe(1);
         }));
+
+        it('should invoke interceptorFns if they are flagged as having externalInput',
+            inject(function($parse) {
+          var called = false;
+          function interceptor() {
+            called = true;
+          }
+          interceptor.externalInput = true;
+
+          scope.$watch($parse("a", interceptor));
+          scope.a = 0;
+          scope.$digest();
+          expect(called).toBe(true);
+
+          called = false;
+          scope.$digest();
+          expect(called).toBe(true);
+
+          scope.a++;
+          called = false;
+          scope.$digest();
+          expect(called).toBe(true);
+        }));
       });
 
       describe('locals', function() {