Merge pull request #3105 from matiassingers/jasmine-call-count-consistency

Jasmine spies call count property consistency

src/browser/__tests__/ReactBrowserEventEmitter-test.js

@@ -377,7 +377,7 @@ describe('ReactBrowserEventEmitter', function() {
     spyOn(EventListener, 'listen');
     ReactBrowserEventEmitter.listenTo(ON_CLICK_KEY, document);
     ReactBrowserEventEmitter.listenTo(ON_CLICK_KEY, document);
-    expect(EventListener.listen.callCount).toBe(1);
+    expect(EventListener.listen.calls.length).toBe(1);
   });
 
   it('should work with event plugins without dependencies', function() {

src/browser/eventPlugins/__tests__/ResponderEventPlugin-test.js

@@ -268,7 +268,7 @@ describe('ResponderEventPlugin', function() {
     extracted = extractForMouseMove(CHILD_ID);
     assertNothingExtracted(extracted);
     // Not going to call `onMoveShould`* if not touching.
-    expect(spies.onMoveShouldSetResponderParent.callCount).toBe(0);
+    expect(spies.onMoveShouldSetResponderParent.calls.length).toBe(0);
     expect(ResponderEventPlugin.getResponderID()).toBe(null);
 
     // Now try the move extraction again, this time while holding down, and not
@@ -280,7 +280,7 @@ describe('ResponderEventPlugin', function() {
     // Now moving can set the responder, if pressing down, even if there is no
     // current responder.
     extracted = extractForMouseMove(CHILD_ID);
-    expect(spies.onMoveShouldSetResponderParent.callCount).toBe(1);
+    expect(spies.onMoveShouldSetResponderParent.calls.length).toBe(1);
     expect(ResponderEventPlugin.getResponderID()).toBe(PARENT_ID);
     assertGrantEvent(PARENT_ID, extracted);
 
@@ -297,7 +297,7 @@ describe('ResponderEventPlugin', function() {
 
     extracted = extractForTouchStart(CHILD_ID);
     assertGrantEvent(CHILD_ID, extracted);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(1);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(1);
 
     // Now we do *not* clear out the touch via a simulated touch end. This mocks
     // out an environment that likely will never happen, but could in some odd
@@ -305,7 +305,7 @@ describe('ResponderEventPlugin', function() {
     // extractForTouchEnd(CHILD_ID); // Clear the responder
     extracted = extractForTouchStart(CHILD_ID);
     assertNothingExtracted();
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(2);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(2);
   });
 
   it('should bubble/capture responder on start', function() {
@@ -324,8 +324,8 @@ describe('ResponderEventPlugin', function() {
 
     extracted = extractForTouchStart(CHILD_ID);
     assertGrantEvent(CHILD_ID, extracted);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(1);
-    expect(spies.onStartShouldSetResponderParent.callCount).toBe(0);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(1);
+    expect(spies.onStartShouldSetResponderParent.calls.length).toBe(0);
 
     // Even if moving on the grandparent, the child will receive responder moves
     // (This is even true for mouse interactions - which we should absolutely
@@ -372,7 +372,7 @@ describe('ResponderEventPlugin', function() {
 
     var extracted = extractForTouchStart(CHILD_ID);
     assertNothingExtracted(extracted);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(1);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(1);
     expect(ResponderEventPlugin.getResponderID()).toBe(CHILD_ID);
     extractForTouchEnd(CHILD_ID); // Clear the responder
 
@@ -381,7 +381,7 @@ describe('ResponderEventPlugin', function() {
     onStartShouldSetResponder(CHILD_ID, spies.onStartShouldSetResponderChild);
     extracted = extractForTouchStart(CHILD_ID);
     assertNothingExtracted(extracted);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(2);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(2);
     expect(ResponderEventPlugin.getResponderID()).toBe(null);
     extractForTouchEnd(CHILD_ID);
     expect(ResponderEventPlugin.getResponderID()).toBe(null); // Still null
@@ -391,7 +391,7 @@ describe('ResponderEventPlugin', function() {
     onStartShouldSetResponder(CHILD_ID, spies.onStartShouldSetResponderChild);
     onResponderGrant(CHILD_ID, onGrantChild);
     extracted = extractForTouchStart(CHILD_ID);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(3);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(3);
     assertGrantEvent(CHILD_ID, extracted);
     extracted = extractForTouchEnd(CHILD_ID); // Clear the responder
     assertRelease(CHILD_ID, extracted);
@@ -410,12 +410,12 @@ describe('ResponderEventPlugin', function() {
     spies.onStartShouldSetResponderChild.andReturn(true);
     onStartShouldSetResponder(CHILD_ID, spies.onStartShouldSetResponderChild);
     extracted = extractForTouchStart(CHILD_ID);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(1);
-    expect(spies.onMoveShouldSetResponderParent.callCount).toBe(0); // none yet
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(1);
+    expect(spies.onMoveShouldSetResponderParent.calls.length).toBe(0); // none yet
     assertGrantEvent(CHILD_ID, extracted);    // Child is the current responder
 
     extracted = extractForTouchMove(CHILD_ID);
-    expect(spies.onMoveShouldSetResponderParent.callCount).toBe(1);
+    expect(spies.onMoveShouldSetResponderParent.calls.length).toBe(1);
     assertGrantEvent(PARENT_ID, extracted);
     assertTerminateEvent(CHILD_ID, extracted);
 
@@ -430,7 +430,7 @@ describe('ResponderEventPlugin', function() {
 
     var extracted = extractForTouchStart(CHILD_ID);
     assertNothingExtracted(extracted);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(1);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(1);
     expect(ResponderEventPlugin.getResponderID()).toBe(CHILD_ID);
     extractForTouchEnd(CHILD_ID); // Clear the responder
     expect(ResponderEventPlugin.getResponderID()).toBe(null);
@@ -440,7 +440,7 @@ describe('ResponderEventPlugin', function() {
     onStartShouldSetResponder(CHILD_ID, spies.onStartShouldSetResponderChild);
     extracted = extractForTouchStart(CHILD_ID);
     assertNothingExtracted(extracted);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(2);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(2);
     expect(ResponderEventPlugin.getResponderID()).toBe(null);
     extractForTouchEnd(CHILD_ID); // Clear the responder
 
@@ -449,7 +449,7 @@ describe('ResponderEventPlugin', function() {
     onStartShouldSetResponder(CHILD_ID, spies.onStartShouldSetResponderChild);
     onResponderGrant(CHILD_ID, onGrantChild);
     extracted = extractForTouchStart(CHILD_ID);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(3);
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(3);
     assertGrantEvent(CHILD_ID, extracted);
     extracted = extractForTouchEnd(CHILD_ID); // Clear the responder
     assertRelease(CHILD_ID, extracted);
@@ -473,16 +473,16 @@ describe('ResponderEventPlugin', function() {
     spies.onStartShouldSetResponderChild.andReturn(true);
     onStartShouldSetResponder(CHILD_ID, spies.onStartShouldSetResponderChild);
     extracted = extractForTouchStart(CHILD_ID);
-    expect(spies.onStartShouldSetResponderChild.callCount).toBe(1);
-    expect(spies.onMoveShouldSetResponderParent.callCount).toBe(0); // none yet
+    expect(spies.onStartShouldSetResponderChild.calls.length).toBe(1);
+    expect(spies.onMoveShouldSetResponderParent.calls.length).toBe(0); // none yet
     assertGrantEvent(CHILD_ID, extracted);    // Child is the current responder
 
     extracted = extractForTouchMove(CHILD_ID);
-    expect(spies.onMoveShouldSetResponderParent.callCount).toBe(1);
+    expect(spies.onMoveShouldSetResponderParent.calls.length).toBe(1);
     assertNothingExtracted(extracted);
 
     extracted = extractForScroll(CHILD_ID); // Could have been parent here too.
-    expect(spies.onScrollShouldSetResponderParent.callCount).toBe(1);
+    expect(spies.onScrollShouldSetResponderParent.calls.length).toBe(1);
     assertGrantEvent(PARENT_ID, extracted);
     assertTerminateEvent(CHILD_ID, extracted);
 

src/browser/ui/__tests__/ReactDOMComponent-test.js

@@ -492,7 +492,7 @@ describe('ReactDOMComponent', function() {
 
       spyOn(console, 'warn');
       ReactTestUtils.renderIntoDocument(<div onScroll={function(){}} />);
-      expect(console.warn.callCount).toBe(1);
+      expect(console.warn.calls.length).toBe(1);
       expect(console.warn.mostRecentCall.args[0]).toBe(
         'This browser doesn\'t support the `onScroll` event'
       );

src/browser/ui/__tests__/ReactDOMIDOperations-test.js

@@ -36,7 +36,7 @@ describe('ReactDOMIDOperations', function() {
     ).toBe('testID');
 
     expect(
-      DOMPropertyOperations.setValueForProperty.callCount
+      DOMPropertyOperations.setValueForProperty.calls.length
     ).toBe(0);
   });
 

src/browser/ui/dom/__tests__/CSSPropertyOperations-test.js

@@ -163,7 +163,7 @@ describe('CSSPropertyOperations', function() {
       color: 'red;   '
     });
 
-    expect(console.warn.callCount).toBe(2);
+    expect(console.warn.calls.length).toBe(2);
     expect(console.warn.argsForCall[0][0]).toContain('Try "backgroundColor: blue" instead');
     expect(console.warn.argsForCall[1][0]).toContain('Try "color: red" instead');
   });

src/core/__tests__/ReactCompositeComponent-test.js

@@ -441,7 +441,7 @@ describe('ReactCompositeComponent', function() {
         // lifecycle methods, because a componentWillMount implementation is
         // likely call this.getDOMNode(), which will repopulate the node cache
         // after it's been cleared, causing a memory leak.
-        expect(ReactMount.purgeID.callCount).toBe(0);
+        expect(ReactMount.purgeID.calls.length).toBe(0);
         innerUnmounted = true;
       },
       render: function() {

src/core/__tests__/ReactMultiChild-test.js

@@ -190,7 +190,7 @@ describe('ReactMultiChild', function() {
         container
       );
       expect(setInnerHTML).toHaveBeenCalled();
-      var callCountOnMount = setInnerHTML.callCount;
+      var callCountOnMount = setInnerHTML.calls.length;
 
       React.render(
         <div>
@@ -200,7 +200,7 @@ describe('ReactMultiChild', function() {
         </div>,
         container
       );
-      expect(setInnerHTML.callCount).toBe(callCountOnMount + 1);
+      expect(setInnerHTML.calls.length).toBe(callCountOnMount + 1);
     });
   });
 });