From 2ecfc4f8fb134609716dead2c8f41a92cda77db5 Mon Sep 17 00:00:00 2001 From: cpojer Date: Wed, 28 Oct 2015 22:15:30 -0700 Subject: [PATCH] Codemod old APIs away. --- .../__tests__/ReactCSSTransitionGroup-test.js | 2 +- .../__tests__/ReactContextValidator-test.js | 2 +- .../classic/class/__tests__/ReactBind-test.js | 9 ++++---- .../class/__tests__/ReactBindOptout-test.js | 11 +++++----- .../class/__tests__/ReactClass-test.js | 10 ++++----- .../class/__tests__/ReactClassMixin-test.js | 12 +++++----- .../element/__tests__/ReactElement-test.js | 6 ++--- .../__tests__/ReactElementClone-test.js | 2 -- .../__tests__/ReactElementValidator-test.js | 2 +- .../types/__tests__/ReactPropTypes-test.js | 2 +- .../__tests__/cloneWithProps-test.js | 2 +- .../element/__tests__/ReactJSXElement-test.js | 2 +- .../ReactJSXElementValidator-test.js | 2 +- .../dom/__tests__/ReactDOMProduction-test.js | 2 +- .../ReactBrowserEventEmitter-test.js | 9 ++++---- .../__tests__/ReactEventIndependence-test.js | 2 +- .../__tests__/ReactEventListener-test.js | 6 ++--- .../dom/client/__tests__/ReactMount-test.js | 10 ++++----- .../__tests__/ReactRenderDocument-test.js | 4 ++-- .../__tests__/validateDOMNesting-test.js | 2 +- .../__tests__/EnterLeaveEventPlugin-test.js | 2 +- .../__tests__/SelectEventPlugin-test.js | 4 +--- .../wrappers/__tests__/ReactDOMButton-test.js | 4 +--- .../wrappers/__tests__/ReactDOMInput-test.js | 21 +++++++++--------- .../wrappers/__tests__/ReactDOMSelect-test.js | 4 +--- .../__tests__/ReactDOMTextarea-test.js | 3 +-- .../__tests__/ReactServerRendering-test.js | 8 +++---- .../dom/shared/__tests__/CSSProperty-test.js | 2 +- .../__tests__/CSSPropertyOperations-test.js | 2 +- .../__tests__/DOMPropertyOperations-test.js | 4 ++-- .../dom/shared/__tests__/Danger-test.js | 2 +- .../__tests__/ReactDOMComponent-test.js | 18 +++++++-------- .../event/__tests__/EventPluginHub-test.js | 4 ++-- .../__tests__/ResponderEventPlugin-test.js | 2 +- .../__tests__/ReactComponent-test.js | 2 +- .../__tests__/ReactComponentLifeCycle-test.js | 2 +- .../__tests__/ReactCompositeComponent-test.js | 2 +- ...ReactCompositeComponentNestedState-test.js | 4 +--- .../ReactCompositeComponentState-test.js | 4 +--- .../__tests__/ReactEmptyComponent-test.js | 2 +- .../__tests__/ReactIdentity-test.js | 2 +- .../__tests__/ReactMultiChild-test.js | 22 +++++++++---------- .../ReactMultiChildReconcile-test.js | 4 +--- .../__tests__/ReactMultiChildText-test.js | 2 -- .../__tests__/ReactStateSetters-test.js | 2 +- .../__tests__/refs-destruction-test.js | 2 +- .../shared/reconciler/__tests__/refs-test.js | 4 ++-- src/shared/utils/__tests__/OrderedMap-test.js | 2 +- .../utils/__tests__/Transaction-test.js | 2 +- .../utils/__tests__/accumulateInto-test.js | 2 +- .../__tests__/traverseAllChildren-test.js | 2 +- src/test/__tests__/ReactDefaultPerf-test.js | 2 +- src/test/__tests__/ReactTestUtils-test.js | 2 +- 53 files changed, 105 insertions(+), 140 deletions(-) diff --git a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js index e0393dc2da..b56eb237a2 100644 --- a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js +++ b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js @@ -23,7 +23,7 @@ describe('ReactCSSTransitionGroup', function() { var container; beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactDOM = require('ReactDOM'); ReactCSSTransitionGroup = require('ReactCSSTransitionGroup'); diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js index 0fa4fd5280..40a5c2fdb5 100644 --- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js +++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js @@ -25,7 +25,7 @@ var reactComponentExpect; describe('ReactContextValidator', function() { beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactDOM = require('ReactDOM'); diff --git a/src/isomorphic/classic/class/__tests__/ReactBind-test.js b/src/isomorphic/classic/class/__tests__/ReactBind-test.js index 4f50f0d6fb..a3d5f1cc54 100644 --- a/src/isomorphic/classic/class/__tests__/ReactBind-test.js +++ b/src/isomorphic/classic/class/__tests__/ReactBind-test.js @@ -11,7 +11,6 @@ /*global global:true*/ 'use strict'; -var mocks = require('mocks'); var React = require('React'); var ReactTestUtils = require('ReactTestUtils'); var reactComponentExpect = require('reactComponentExpect'); @@ -21,9 +20,9 @@ describe('autobinding', function() { it('Holds reference to instance', function() { - var mouseDidEnter = mocks.getMockFunction(); - var mouseDidLeave = mocks.getMockFunction(); - var mouseDidClick = mocks.getMockFunction(); + var mouseDidEnter = jest.genMockFn(); + var mouseDidLeave = jest.genMockFn(); + var mouseDidClick = jest.genMockFn(); var TestBindComponent = React.createClass({ getInitialState: function() { @@ -96,7 +95,7 @@ describe('autobinding', function() { }); it('works with mixins', function() { - var mouseDidClick = mocks.getMockFunction(); + var mouseDidClick = jest.genMockFn(); var TestMixin = { onClick: mouseDidClick, diff --git a/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js b/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js index cb416258bc..e7c42b69f4 100644 --- a/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js +++ b/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js @@ -11,7 +11,6 @@ /*global global:true*/ 'use strict'; -var mocks = require('mocks'); var React = require('React'); var ReactTestUtils = require('ReactTestUtils'); var reactComponentExpect = require('reactComponentExpect'); @@ -21,9 +20,9 @@ describe('autobind optout', function() { it('should work with manual binding', function() { - var mouseDidEnter = mocks.getMockFunction(); - var mouseDidLeave = mocks.getMockFunction(); - var mouseDidClick = mocks.getMockFunction(); + var mouseDidEnter = jest.genMockFn(); + var mouseDidLeave = jest.genMockFn(); + var mouseDidClick = jest.genMockFn(); var TestBindComponent = React.createClass({ autobind: false, @@ -139,7 +138,7 @@ describe('autobind optout', function() { }); it('works with mixins that have not opted out of autobinding', function() { - var mouseDidClick = mocks.getMockFunction(); + var mouseDidClick = jest.genMockFn(); var TestMixin = { onClick: mouseDidClick, @@ -165,7 +164,7 @@ describe('autobind optout', function() { }); it('works with mixins that have opted out of autobinding', function() { - var mouseDidClick = mocks.getMockFunction(); + var mouseDidClick = jest.genMockFn(); var TestMixin = { autobind: false, diff --git a/src/isomorphic/classic/class/__tests__/ReactClass-test.js b/src/isomorphic/classic/class/__tests__/ReactClass-test.js index f684c8a10a..6d273d72ff 100644 --- a/src/isomorphic/classic/class/__tests__/ReactClass-test.js +++ b/src/isomorphic/classic/class/__tests__/ReactClass-test.js @@ -11,8 +11,6 @@ 'use strict'; -var mocks = require('mocks'); - var React; var ReactDOM; var ReactTestUtils; @@ -46,7 +44,7 @@ describe('ReactClass-spec', function() { }); it('should copy prop types onto the Constructor', function() { - var propValidator = mocks.getMockFunction(); + var propValidator = jest.genMockFn(); var TestComponent = React.createClass({ propTypes: { value: propValidator, @@ -63,7 +61,7 @@ describe('ReactClass-spec', function() { it('should warn on invalid prop types', function() { var warn = console.error; - console.error = mocks.getMockFunction(); + console.error = jest.genMockFn(); try { React.createClass({ @@ -87,7 +85,7 @@ describe('ReactClass-spec', function() { it('should warn on invalid context types', function() { var warn = console.error; - console.error = mocks.getMockFunction(); + console.error = jest.genMockFn(); try { React.createClass({ displayName: 'Component', @@ -110,7 +108,7 @@ describe('ReactClass-spec', function() { it('should throw on invalid child context types', function() { var warn = console.error; - console.error = mocks.getMockFunction(); + console.error = jest.genMockFn(); try { React.createClass({ displayName: 'Component', diff --git a/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js b/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js index 84d434ffa9..c09d064d1d 100644 --- a/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js +++ b/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js @@ -11,8 +11,6 @@ 'use strict'; -var mocks = require('mocks'); - var React; var ReactTestUtils; @@ -27,8 +25,8 @@ describe('ReactClass-mixin', function() { beforeEach(function() { React = require('React'); ReactTestUtils = require('ReactTestUtils'); - mixinPropValidator = mocks.getMockFunction(); - componentPropValidator = mocks.getMockFunction(); + mixinPropValidator = jest.genMockFn(); + componentPropValidator = jest.genMockFn(); var MixinA = { propTypes: { @@ -109,7 +107,7 @@ describe('ReactClass-mixin', function() { }); it('should support merging propTypes and statics', function() { - var listener = mocks.getMockFunction(); + var listener = jest.genMockFn(); var instance = ; instance = ReactTestUtils.renderIntoDocument(instance); @@ -124,7 +122,7 @@ describe('ReactClass-mixin', function() { }); it('should support chaining delegate functions', function() { - var listener = mocks.getMockFunction(); + var listener = jest.genMockFn(); var instance = ; instance = ReactTestUtils.renderIntoDocument(instance); @@ -137,7 +135,7 @@ describe('ReactClass-mixin', function() { }); it('should chain functions regardless of spec property order', function() { - var listener = mocks.getMockFunction(); + var listener = jest.genMockFn(); var instance = ; instance = ReactTestUtils.renderIntoDocument(instance); diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js index b3c8cc4129..617ceed237 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js @@ -23,7 +23,7 @@ describe('ReactElement', function() { var originalSymbol; beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); // Delete the native Symbol if we have one to ensure we test the // unpolyfilled environment. @@ -339,7 +339,7 @@ describe('ReactElement', function() { return OTHER_SYMBOL; }; - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); @@ -372,7 +372,7 @@ describe('comparing jsx vs .createFactory() vs .createElement()', function() { var Child, mocks; beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); mocks = require('mocks'); React = require('React'); ReactDOM = require('ReactDOM'); diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js index 952e5eb243..c2743b83aa 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js @@ -11,8 +11,6 @@ 'use strict'; -require('mock-modules'); - var React; var ReactDOM; var ReactTestUtils; diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js index 6f1cce5797..ed53c7f9ee 100644 --- a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js +++ b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js @@ -22,7 +22,7 @@ describe('ReactElementValidator', function() { var ComponentClass; beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactDOM = require('ReactDOM'); diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js index aa23672d92..9dc75a7b39 100644 --- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js +++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js @@ -764,7 +764,7 @@ describe('ReactPropTypes', function() { describe('Custom validator', function() { beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); spyOn(console, 'error'); }); diff --git a/src/isomorphic/deprecated/__tests__/cloneWithProps-test.js b/src/isomorphic/deprecated/__tests__/cloneWithProps-test.js index dedc4bf1b7..868b1b57ad 100644 --- a/src/isomorphic/deprecated/__tests__/cloneWithProps-test.js +++ b/src/isomorphic/deprecated/__tests__/cloneWithProps-test.js @@ -22,7 +22,7 @@ var emptyObject; describe('cloneWithProps', function() { beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactDOM = require('ReactDOM'); ReactTestUtils = require('ReactTestUtils'); diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js index 0a87205c17..94ea88b6bc 100644 --- a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js +++ b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js @@ -19,7 +19,7 @@ describe('ReactJSXElement', function() { var Component; beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactDOM = require('ReactDOM'); diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js index cc50840f8d..5471135aef 100644 --- a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js +++ b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js @@ -22,7 +22,7 @@ describe('ReactJSXElementValidator', function() { var RequiredPropComponent; beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactTestUtils = require('ReactTestUtils'); diff --git a/src/renderers/dom/__tests__/ReactDOMProduction-test.js b/src/renderers/dom/__tests__/ReactDOMProduction-test.js index 997958caf8..725a904ef6 100644 --- a/src/renderers/dom/__tests__/ReactDOMProduction-test.js +++ b/src/renderers/dom/__tests__/ReactDOMProduction-test.js @@ -22,7 +22,7 @@ describe('ReactDOMProduction', function() { oldProcess = process; global.process = {env: {NODE_ENV: 'production'}}; - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactDOM = require('ReactDOM'); }); diff --git a/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js index 09796a81a3..7d84831a68 100644 --- a/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js +++ b/src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js @@ -12,7 +12,6 @@ 'use strict'; var keyOf = require('keyOf'); -var mocks = require('mocks'); var ReactMount = require('ReactMount'); var idToNode = {}; @@ -44,7 +43,7 @@ var recordIDAndReturnFalse = function(id, event) { recordID(id); return false; }; -var LISTENER = mocks.getMockFunction(); +var LISTENER = jest.genMockFn(); var ON_CLICK_KEY = keyOf({onClick: null}); var ON_TOUCH_TAP_KEY = keyOf({onTouchTap: null}); var ON_CHANGE_KEY = keyOf({onChange: null}); @@ -76,7 +75,7 @@ function registerSimpleTestHandler() { describe('ReactBrowserEventEmitter', function() { beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); LISTENER.mockClear(); EventPluginHub = require('EventPluginHub'); EventPluginRegistry = require('EventPluginRegistry'); @@ -306,7 +305,7 @@ describe('ReactBrowserEventEmitter', function() { */ it('should invoke handlers that were removed while bubbling', function() { - var handleParentClick = mocks.getMockFunction(); + var handleParentClick = jest.genMockFn(); var handleChildClick = function(event) { EventPluginHub.deleteAllListeners(getID(PARENT)); }; @@ -325,7 +324,7 @@ describe('ReactBrowserEventEmitter', function() { }); it('should not invoke newly inserted handlers while bubbling', function() { - var handleParentClick = mocks.getMockFunction(); + var handleParentClick = jest.genMockFn(); var handleChildClick = function(event) { EventPluginHub.putListener( getID(PARENT), diff --git a/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js b/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js index 621118cfd4..07086b0563 100644 --- a/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js +++ b/src/renderers/dom/client/__tests__/ReactEventIndependence-test.js @@ -17,7 +17,7 @@ var ReactTestUtils; describe('ReactEventIndependence', function() { beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactDOM = require('ReactDOM'); diff --git a/src/renderers/dom/client/__tests__/ReactEventListener-test.js b/src/renderers/dom/client/__tests__/ReactEventListener-test.js index cfb6bb28f5..42e5dbc552 100644 --- a/src/renderers/dom/client/__tests__/ReactEventListener-test.js +++ b/src/renderers/dom/client/__tests__/ReactEventListener-test.js @@ -11,8 +11,6 @@ 'use strict'; -var mocks = require('mocks'); - var EVENT_TARGET_PARAM = 1; @@ -27,7 +25,7 @@ describe('ReactEventListener', function() { var handleTopLevel; beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); React = require('React'); ReactDOM = require('ReactDOM'); @@ -36,7 +34,7 @@ describe('ReactEventListener', function() { ReactEventListener = require('ReactEventListener'); ReactTestUtils = require('ReactTestUtils'); - handleTopLevel = mocks.getMockFunction(); + handleTopLevel = jest.genMockFn(); ReactEventListener._handleTopLevel = handleTopLevel; }); diff --git a/src/renderers/dom/client/__tests__/ReactMount-test.js b/src/renderers/dom/client/__tests__/ReactMount-test.js index 41826b8b35..6328a06092 100644 --- a/src/renderers/dom/client/__tests__/ReactMount-test.js +++ b/src/renderers/dom/client/__tests__/ReactMount-test.js @@ -11,8 +11,6 @@ 'use strict'; -var mocks = require('mocks'); - describe('ReactMount', function() { var React = require('React'); var ReactDOM = require('ReactDOM'); @@ -81,8 +79,8 @@ describe('ReactMount', function() { it('should unmount and remount if the key changes', function() { var container = document.createElement('container'); - var mockMount = mocks.getMockFunction(); - var mockUnmount = mocks.getMockFunction(); + var mockMount = jest.genMockFn(); + var mockUnmount = jest.genMockFn(); var Component = React.createClass({ componentDidMount: mockMount, @@ -199,9 +197,9 @@ describe('ReactMount', function() { } it('warns when using two copies of React before throwing', function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); var RD1 = require('ReactDOM'); - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); var RD2 = require('ReactDOM'); var X = React.createClass({ diff --git a/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js b/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js index 31ffad5d90..2c9d642724 100644 --- a/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js +++ b/src/renderers/dom/client/__tests__/ReactRenderDocument-test.js @@ -11,7 +11,7 @@ 'use strict'; -require('mock-modules') +jest .mock('ServerReactRootIndex'); var React; @@ -33,7 +33,7 @@ var UNMOUNT_INVARIANT_MESSAGE = describe('rendering React components at document', function() { beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); // Negative integer creator. So they won't get confused with // the Client positive ids. diff --git a/src/renderers/dom/client/__tests__/validateDOMNesting-test.js b/src/renderers/dom/client/__tests__/validateDOMNesting-test.js index a7878289cb..7f671c61f8 100644 --- a/src/renderers/dom/client/__tests__/validateDOMNesting-test.js +++ b/src/renderers/dom/client/__tests__/validateDOMNesting-test.js @@ -47,7 +47,7 @@ function isTagStackValid(stack) { describe('ReactContextValidator', function() { beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); validateDOMNesting = require('validateDOMNesting'); }); diff --git a/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js b/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js index 4040b3beb2..5d3afd3ee8 100644 --- a/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js +++ b/src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js @@ -21,7 +21,7 @@ var topLevelTypes; describe('EnterLeaveEventPlugin', function() { beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); EnterLeaveEventPlugin = require('EnterLeaveEventPlugin'); EventConstants = require('EventConstants'); diff --git a/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js b/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js index 8a536c13fb..e9b8be7347 100644 --- a/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js +++ b/src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js @@ -61,15 +61,13 @@ describe('SelectEventPlugin', function() { }); it('should extract if an `onSelect` listener is present', function() { - var mocks = require('mocks'); - var WithSelect = React.createClass({ render: function() { return ; }, }); - var cb = mocks.getMockFunction(); + var cb = jest.genMockFn(); var rendered = ReactTestUtils.renderIntoDocument( diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMButton-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMButton-test.js index f536d93c70..9ca6b1ebfb 100644 --- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMButton-test.js +++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMButton-test.js @@ -12,14 +12,12 @@ 'use strict'; -var mocks = require('mocks'); - describe('ReactDOMButton', function() { var React; var ReactDOM; var ReactTestUtils; - var onClick = mocks.getMockFunction(); + var onClick = jest.genMockFn(); function expectClickThru(button) { onClick.mockClear(); diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js index da680b92af..ffa90a059d 100644 --- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js +++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js @@ -13,7 +13,6 @@ var emptyFunction = require('emptyFunction'); -var mocks = require('mocks'); describe('ReactDOMInput', function() { var EventConstants; @@ -23,7 +22,7 @@ describe('ReactDOMInput', function() { var ReactTestUtils; beforeEach(function() { - require('mock-modules').dumpCache(); + jest.resetModuleRegistry(); EventConstants = require('EventConstants'); React = require('React'); ReactDOM = require('ReactDOM'); @@ -235,7 +234,7 @@ describe('ReactDOMInput', function() { }); it('should support ReactLink', function() { - var link = new ReactLink('yolo', mocks.getMockFunction()); + var link = new ReactLink('yolo', jest.genMockFn()); var instance = ; instance = ReactTestUtils.renderIntoDocument(instance); @@ -252,7 +251,7 @@ describe('ReactDOMInput', function() { }); it('should warn with value and no onChange handler', function() { - var link = new ReactLink('yolo', mocks.getMockFunction()); + var link = new ReactLink('yolo', jest.genMockFn()); ReactTestUtils.renderIntoDocument(); expect(console.error.argsForCall.length).toBe(1); expect(console.error.argsForCall[0][0]).toContain( @@ -260,7 +259,7 @@ describe('ReactDOMInput', function() { ); ReactTestUtils.renderIntoDocument( - + ); expect(console.error.argsForCall.length).toBe(1); ReactTestUtils.renderIntoDocument(); @@ -292,7 +291,7 @@ describe('ReactDOMInput', function() { it('should throw if both value and valueLink are provided', function() { var node = document.createElement('div'); - var link = new ReactLink('yolo', mocks.getMockFunction()); + var link = new ReactLink('yolo', jest.genMockFn()); var instance = ; expect(() => ReactDOM.render(instance, node)).not.toThrow(); @@ -312,7 +311,7 @@ describe('ReactDOMInput', function() { }); it('should support checkedLink', function() { - var link = new ReactLink(true, mocks.getMockFunction()); + var link = new ReactLink(true, jest.genMockFn()); var instance = ; instance = ReactTestUtils.renderIntoDocument(instance); @@ -330,7 +329,7 @@ describe('ReactDOMInput', function() { it('should warn with checked and no onChange handler', function() { var node = document.createElement('div'); - var link = new ReactLink(true, mocks.getMockFunction()); + var link = new ReactLink(true, jest.genMockFn()); ReactDOM.render(, node); expect(console.error.argsForCall.length).toBe(1); expect(console.error.argsForCall[0][0]).toContain( @@ -341,7 +340,7 @@ describe('ReactDOMInput', function() { ); expect(console.error.argsForCall.length).toBe(1); @@ -369,7 +368,7 @@ describe('ReactDOMInput', function() { it('should throw if both checked and checkedLink are provided', function() { var node = document.createElement('div'); - var link = new ReactLink(true, mocks.getMockFunction()); + var link = new ReactLink(true, jest.genMockFn()); var instance = ; expect(() => ReactDOM.render(instance, node)).not.toThrow(); @@ -391,7 +390,7 @@ describe('ReactDOMInput', function() { it('should throw if both checkedLink and valueLink are provided', function() { var node = document.createElement('div'); - var link = new ReactLink(true, mocks.getMockFunction()); + var link = new ReactLink(true, jest.genMockFn()); var instance = ; expect(() => ReactDOM.render(instance, node)).not.toThrow(); diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js index ac7f67819a..56ee48e11a 100644 --- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js +++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js @@ -12,8 +12,6 @@ 'use strict'; -var mocks = require('mocks'); - describe('ReactDOMSelect', function() { var React; var ReactDOM; @@ -350,7 +348,7 @@ describe('ReactDOMSelect', function() { }); it('should support ReactLink', function() { - var link = new ReactLink('giraffe', mocks.getMockFunction()); + var link = new ReactLink('giraffe', jest.genMockFn()); var stub =