@samitouri / QOS-React-2 / commits / 2ecfc4f8fb

Codemod old APIs away.

cpojer committed Oct 28, 2015 at 22:15 UTC 2ecfc4f8fb134609716dead2c8f41a92cda77db5
53 files changed +105 -140
src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
+1 -1
@@ -23,7 +23,7 @@ describe('ReactCSSTransitionGroup', function() {
23 var container;
24
25 beforeEach(function() {
26 - require('mock-modules').dumpCache();
26 + jest.resetModuleRegistry();
27 React = require('React');
28 ReactDOM = require('ReactDOM');
29 ReactCSSTransitionGroup = require('ReactCSSTransitionGroup');
src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+1 -1
@@ -25,7 +25,7 @@ var reactComponentExpect;
25
26 describe('ReactContextValidator', function() {
27 beforeEach(function() {
28 - require('mock-modules').dumpCache();
28 + jest.resetModuleRegistry();
29
30 React = require('React');
31 ReactDOM = require('ReactDOM');
src/isomorphic/classic/class/__tests__/ReactBind-test.js
+4 -5
@@ -11,7 +11,6 @@
11 /*global global:true*/
12 'use strict';
13
14 -var mocks = require('mocks');
14 var React = require('React');
15 var ReactTestUtils = require('ReactTestUtils');
16 var reactComponentExpect = require('reactComponentExpect');
@@ -21,9 +20,9 @@ describe('autobinding', function() {
20
21 it('Holds reference to instance', function() {
22
24 - var mouseDidEnter = mocks.getMockFunction();
25 - var mouseDidLeave = mocks.getMockFunction();
26 - var mouseDidClick = mocks.getMockFunction();
23 + var mouseDidEnter = jest.genMockFn();
24 + var mouseDidLeave = jest.genMockFn();
25 + var mouseDidClick = jest.genMockFn();
26
27 var TestBindComponent = React.createClass({
28 getInitialState: function() {
@@ -96,7 +95,7 @@ describe('autobinding', function() {
95 });
96
97 it('works with mixins', function() {
99 - var mouseDidClick = mocks.getMockFunction();
98 + var mouseDidClick = jest.genMockFn();
99
100 var TestMixin = {
101 onClick: mouseDidClick,
src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
+5 -6
@@ -11,7 +11,6 @@
11 /*global global:true*/
12 'use strict';
13
14 -var mocks = require('mocks');
14 var React = require('React');
15 var ReactTestUtils = require('ReactTestUtils');
16 var reactComponentExpect = require('reactComponentExpect');
@@ -21,9 +20,9 @@ describe('autobind optout', function() {
20
21 it('should work with manual binding', function() {
22
24 - var mouseDidEnter = mocks.getMockFunction();
25 - var mouseDidLeave = mocks.getMockFunction();
26 - var mouseDidClick = mocks.getMockFunction();
23 + var mouseDidEnter = jest.genMockFn();
24 + var mouseDidLeave = jest.genMockFn();
25 + var mouseDidClick = jest.genMockFn();
26
27 var TestBindComponent = React.createClass({
28 autobind: false,
@@ -139,7 +138,7 @@ describe('autobind optout', function() {
138 });
139
140 it('works with mixins that have not opted out of autobinding', function() {
142 - var mouseDidClick = mocks.getMockFunction();
141 + var mouseDidClick = jest.genMockFn();
142
143 var TestMixin = {
144 onClick: mouseDidClick,
@@ -165,7 +164,7 @@ describe('autobind optout', function() {
164 });
165
166 it('works with mixins that have opted out of autobinding', function() {
168 - var mouseDidClick = mocks.getMockFunction();
167 + var mouseDidClick = jest.genMockFn();
168
169 var TestMixin = {
170 autobind: false,
src/isomorphic/classic/class/__tests__/ReactClass-test.js
+4 -6
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -var mocks = require('mocks');
15 -
14 var React;
15 var ReactDOM;
16 var ReactTestUtils;
@@ -46,7 +44,7 @@ describe('ReactClass-spec', function() {
44 });
45
46 it('should copy prop types onto the Constructor', function() {
49 - var propValidator = mocks.getMockFunction();
47 + var propValidator = jest.genMockFn();
48 var TestComponent = React.createClass({
49 propTypes: {
50 value: propValidator,
@@ -63,7 +61,7 @@ describe('ReactClass-spec', function() {
61
62 it('should warn on invalid prop types', function() {
63 var warn = console.error;
66 - console.error = mocks.getMockFunction();
64 + console.error = jest.genMockFn();
65 try {
66
67 React.createClass({
@@ -87,7 +85,7 @@ describe('ReactClass-spec', function() {
85
86 it('should warn on invalid context types', function() {
87 var warn = console.error;
90 - console.error = mocks.getMockFunction();
88 + console.error = jest.genMockFn();
89 try {
90 React.createClass({
91 displayName: 'Component',
@@ -110,7 +108,7 @@ describe('ReactClass-spec', function() {
108
109 it('should throw on invalid child context types', function() {
110 var warn = console.error;
113 - console.error = mocks.getMockFunction();
111 + console.error = jest.genMockFn();
112 try {
113 React.createClass({
114 displayName: 'Component',
src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
+5 -7
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -var mocks = require('mocks');
15 -
14 var React;
15 var ReactTestUtils;
16
@@ -27,8 +25,8 @@ describe('ReactClass-mixin', function() {
25 beforeEach(function() {
26 React = require('React');
27 ReactTestUtils = require('ReactTestUtils');
30 - mixinPropValidator = mocks.getMockFunction();
31 - componentPropValidator = mocks.getMockFunction();
28 + mixinPropValidator = jest.genMockFn();
29 + componentPropValidator = jest.genMockFn();
30
31 var MixinA = {
32 propTypes: {
@@ -109,7 +107,7 @@ describe('ReactClass-mixin', function() {
107 });
108
109 it('should support merging propTypes and statics', function() {
112 - var listener = mocks.getMockFunction();
110 + var listener = jest.genMockFn();
111 var instance = <TestComponent listener={listener} />;
112 instance = ReactTestUtils.renderIntoDocument(instance);
113
@@ -124,7 +122,7 @@ describe('ReactClass-mixin', function() {
122 });
123
124 it('should support chaining delegate functions', function() {
127 - var listener = mocks.getMockFunction();
125 + var listener = jest.genMockFn();
126 var instance = <TestComponent listener={listener} />;
127 instance = ReactTestUtils.renderIntoDocument(instance);
128
@@ -137,7 +135,7 @@ describe('ReactClass-mixin', function() {
135 });
136
137 it('should chain functions regardless of spec property order', function() {
140 - var listener = mocks.getMockFunction();
138 + var listener = jest.genMockFn();
139 var instance = <TestComponentWithReverseSpec listener={listener} />;
140 instance = ReactTestUtils.renderIntoDocument(instance);
141
src/isomorphic/classic/element/__tests__/ReactElement-test.js
+3 -3
@@ -23,7 +23,7 @@ describe('ReactElement', function() {
23 var originalSymbol;
24
25 beforeEach(function() {
26 - require('mock-modules').dumpCache();
26 + jest.resetModuleRegistry();
27
28 // Delete the native Symbol if we have one to ensure we test the
29 // unpolyfilled environment.
@@ -339,7 +339,7 @@ describe('ReactElement', function() {
339 return OTHER_SYMBOL;
340 };
341
342 - require('mock-modules').dumpCache();
342 + jest.resetModuleRegistry();
343
344 React = require('React');
345
@@ -372,7 +372,7 @@ describe('comparing jsx vs .createFactory() vs .createElement()', function() {
372 var Child, mocks;
373
374 beforeEach(function() {
375 - require('mock-modules').dumpCache();
375 + jest.resetModuleRegistry();
376 mocks = require('mocks');
377 React = require('React');
378 ReactDOM = require('ReactDOM');
src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
-2
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -require('mock-modules');
15 -
14 var React;
15 var ReactDOM;
16 var ReactTestUtils;
src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
+1 -1
@@ -22,7 +22,7 @@ describe('ReactElementValidator', function() {
22 var ComponentClass;
23
24 beforeEach(function() {
25 - require('mock-modules').dumpCache();
25 + jest.resetModuleRegistry();
26
27 React = require('React');
28 ReactDOM = require('ReactDOM');
src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
+1 -1
@@ -764,7 +764,7 @@ describe('ReactPropTypes', function() {
764
765 describe('Custom validator', function() {
766 beforeEach(function() {
767 - require('mock-modules').dumpCache();
767 + jest.resetModuleRegistry();
768 spyOn(console, 'error');
769 });
770
src/isomorphic/deprecated/__tests__/cloneWithProps-test.js
+1 -1
@@ -22,7 +22,7 @@ var emptyObject;
22 describe('cloneWithProps', function() {
23
24 beforeEach(function() {
25 - require('mock-modules').dumpCache();
25 + jest.resetModuleRegistry();
26 React = require('React');
27 ReactDOM = require('ReactDOM');
28 ReactTestUtils = require('ReactTestUtils');
src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
+1 -1
@@ -19,7 +19,7 @@ describe('ReactJSXElement', function() {
19 var Component;
20
21 beforeEach(function() {
22 - require('mock-modules').dumpCache();
22 + jest.resetModuleRegistry();
23
24 React = require('React');
25 ReactDOM = require('ReactDOM');
src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
+1 -1
@@ -22,7 +22,7 @@ describe('ReactJSXElementValidator', function() {
22 var RequiredPropComponent;
23
24 beforeEach(function() {
25 - require('mock-modules').dumpCache();
25 + jest.resetModuleRegistry();
26
27 React = require('React');
28 ReactTestUtils = require('ReactTestUtils');
src/renderers/dom/__tests__/ReactDOMProduction-test.js
+1 -1
@@ -22,7 +22,7 @@ describe('ReactDOMProduction', function() {
22 oldProcess = process;
23 global.process = {env: {NODE_ENV: 'production'}};
24
25 - require('mock-modules').dumpCache();
25 + jest.resetModuleRegistry();
26 React = require('React');
27 ReactDOM = require('ReactDOM');
28 });
src/renderers/dom/client/__tests__/ReactBrowserEventEmitter-test.js
+4 -5
@@ -12,7 +12,6 @@
12 'use strict';
13
14 var keyOf = require('keyOf');
15 -var mocks = require('mocks');
15
16 var ReactMount = require('ReactMount');
17 var idToNode = {};
@@ -44,7 +43,7 @@ var recordIDAndReturnFalse = function(id, event) {
43 recordID(id);
44 return false;
45 };
47 -var LISTENER = mocks.getMockFunction();
46 +var LISTENER = jest.genMockFn();
47 var ON_CLICK_KEY = keyOf({onClick: null});
48 var ON_TOUCH_TAP_KEY = keyOf({onTouchTap: null});
49 var ON_CHANGE_KEY = keyOf({onChange: null});
@@ -76,7 +75,7 @@ function registerSimpleTestHandler() {
75
76 describe('ReactBrowserEventEmitter', function() {
77 beforeEach(function() {
79 - require('mock-modules').dumpCache();
78 + jest.resetModuleRegistry();
79 LISTENER.mockClear();
80 EventPluginHub = require('EventPluginHub');
81 EventPluginRegistry = require('EventPluginRegistry');
@@ -306,7 +305,7 @@ describe('ReactBrowserEventEmitter', function() {
305 */
306
307 it('should invoke handlers that were removed while bubbling', function() {
309 - var handleParentClick = mocks.getMockFunction();
308 + var handleParentClick = jest.genMockFn();
309 var handleChildClick = function(event) {
310 EventPluginHub.deleteAllListeners(getID(PARENT));
311 };
@@ -325,7 +324,7 @@ describe('ReactBrowserEventEmitter', function() {
324 });
325
326 it('should not invoke newly inserted handlers while bubbling', function() {
328 - var handleParentClick = mocks.getMockFunction();
327 + var handleParentClick = jest.genMockFn();
328 var handleChildClick = function(event) {
329 EventPluginHub.putListener(
330 getID(PARENT),
src/renderers/dom/client/__tests__/ReactEventIndependence-test.js
+1 -1
@@ -17,7 +17,7 @@ var ReactTestUtils;
17
18 describe('ReactEventIndependence', function() {
19 beforeEach(function() {
20 - require('mock-modules').dumpCache();
20 + jest.resetModuleRegistry();
21
22 React = require('React');
23 ReactDOM = require('ReactDOM');
src/renderers/dom/client/__tests__/ReactEventListener-test.js
+2 -4
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -var mocks = require('mocks');
15 -
14
15 var EVENT_TARGET_PARAM = 1;
16
@@ -27,7 +25,7 @@ describe('ReactEventListener', function() {
25 var handleTopLevel;
26
27 beforeEach(function() {
30 - require('mock-modules').dumpCache();
28 + jest.resetModuleRegistry();
29 React = require('React');
30
31 ReactDOM = require('ReactDOM');
@@ -36,7 +34,7 @@ describe('ReactEventListener', function() {
34 ReactEventListener = require('ReactEventListener');
35 ReactTestUtils = require('ReactTestUtils');
36
39 - handleTopLevel = mocks.getMockFunction();
37 + handleTopLevel = jest.genMockFn();
38 ReactEventListener._handleTopLevel = handleTopLevel;
39 });
40
src/renderers/dom/client/__tests__/ReactMount-test.js
+4 -6
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -var mocks = require('mocks');
15 -
14 describe('ReactMount', function() {
15 var React = require('React');
16 var ReactDOM = require('ReactDOM');
@@ -81,8 +79,8 @@ describe('ReactMount', function() {
79 it('should unmount and remount if the key changes', function() {
80 var container = document.createElement('container');
81
84 - var mockMount = mocks.getMockFunction();
85 - var mockUnmount = mocks.getMockFunction();
82 + var mockMount = jest.genMockFn();
83 + var mockUnmount = jest.genMockFn();
84
85 var Component = React.createClass({
86 componentDidMount: mockMount,
@@ -199,9 +197,9 @@ describe('ReactMount', function() {
197 }
198
199 it('warns when using two copies of React before throwing', function() {
202 - require('mock-modules').dumpCache();
200 + jest.resetModuleRegistry();
201 var RD1 = require('ReactDOM');
204 - require('mock-modules').dumpCache();
202 + jest.resetModuleRegistry();
203 var RD2 = require('ReactDOM');
204
205 var X = React.createClass({
src/renderers/dom/client/__tests__/ReactRenderDocument-test.js
+2 -2
@@ -11,7 +11,7 @@
11
12 'use strict';
13
14 -require('mock-modules')
14 +jest
15 .mock('ServerReactRootIndex');
16
17 var React;
@@ -33,7 +33,7 @@ var UNMOUNT_INVARIANT_MESSAGE =
33
34 describe('rendering React components at document', function() {
35 beforeEach(function() {
36 - require('mock-modules').dumpCache();
36 + jest.resetModuleRegistry();
37
38 // Negative integer creator. So they won't get confused with
39 // the Client positive ids.
src/renderers/dom/client/__tests__/validateDOMNesting-test.js
+1 -1
@@ -47,7 +47,7 @@ function isTagStackValid(stack) {
47
48 describe('ReactContextValidator', function() {
49 beforeEach(function() {
50 - require('mock-modules').dumpCache();
50 + jest.resetModuleRegistry();
51
52 validateDOMNesting = require('validateDOMNesting');
53 });
src/renderers/dom/client/eventPlugins/__tests__/EnterLeaveEventPlugin-test.js
+1 -1
@@ -21,7 +21,7 @@ var topLevelTypes;
21
22 describe('EnterLeaveEventPlugin', function() {
23 beforeEach(function() {
24 - require('mock-modules').dumpCache();
24 + jest.resetModuleRegistry();
25
26 EnterLeaveEventPlugin = require('EnterLeaveEventPlugin');
27 EventConstants = require('EventConstants');
src/renderers/dom/client/eventPlugins/__tests__/SelectEventPlugin-test.js
+1 -3
@@ -61,15 +61,13 @@ describe('SelectEventPlugin', function() {
61 });
62
63 it('should extract if an `onSelect` listener is present', function() {
64 - var mocks = require('mocks');
65 -
64 var WithSelect = React.createClass({
65 render: function() {
66 return <input type="text" onSelect={this.props.onSelect} />;
67 },
68 });
69
72 - var cb = mocks.getMockFunction();
70 + var cb = jest.genMockFn();
71
72 var rendered = ReactTestUtils.renderIntoDocument(
73 <WithSelect onSelect={cb} />
src/renderers/dom/client/wrappers/__tests__/ReactDOMButton-test.js
+1 -3
@@ -12,14 +12,12 @@
12 'use strict';
13
14
15 -var mocks = require('mocks');
16 -
15 describe('ReactDOMButton', function() {
16 var React;
17 var ReactDOM;
18 var ReactTestUtils;
19
22 - var onClick = mocks.getMockFunction();
20 + var onClick = jest.genMockFn();
21
22 function expectClickThru(button) {
23 onClick.mockClear();
src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js
+10 -11
@@ -13,7 +13,6 @@
13
14
15 var emptyFunction = require('emptyFunction');
16 -var mocks = require('mocks');
16
17 describe('ReactDOMInput', function() {
18 var EventConstants;
@@ -23,7 +22,7 @@ describe('ReactDOMInput', function() {
22 var ReactTestUtils;
23
24 beforeEach(function() {
26 - require('mock-modules').dumpCache();
25 + jest.resetModuleRegistry();
26 EventConstants = require('EventConstants');
27 React = require('React');
28 ReactDOM = require('ReactDOM');
@@ -235,7 +234,7 @@ describe('ReactDOMInput', function() {
234 });
235
236 it('should support ReactLink', function() {
238 - var link = new ReactLink('yolo', mocks.getMockFunction());
237 + var link = new ReactLink('yolo', jest.genMockFn());
238 var instance = <input type="text" valueLink={link} />;
239
240 instance = ReactTestUtils.renderIntoDocument(instance);
@@ -252,7 +251,7 @@ describe('ReactDOMInput', function() {
251 });
252
253 it('should warn with value and no onChange handler', function() {
255 - var link = new ReactLink('yolo', mocks.getMockFunction());
254 + var link = new ReactLink('yolo', jest.genMockFn());
255 ReactTestUtils.renderIntoDocument(<input type="text" valueLink={link} />);
256 expect(console.error.argsForCall.length).toBe(1);
257 expect(console.error.argsForCall[0][0]).toContain(
@@ -260,7 +259,7 @@ describe('ReactDOMInput', function() {
259 );
260
261 ReactTestUtils.renderIntoDocument(
263 - <input type="text" value="zoink" onChange={mocks.getMockFunction()} />
262 + <input type="text" value="zoink" onChange={jest.genMockFn()} />
263 );
264 expect(console.error.argsForCall.length).toBe(1);
265 ReactTestUtils.renderIntoDocument(<input type="text" value="zoink" />);
@@ -292,7 +291,7 @@ describe('ReactDOMInput', function() {
291
292 it('should throw if both value and valueLink are provided', function() {
293 var node = document.createElement('div');
295 - var link = new ReactLink('yolo', mocks.getMockFunction());
294 + var link = new ReactLink('yolo', jest.genMockFn());
295 var instance = <input type="text" valueLink={link} />;
296
297 expect(() => ReactDOM.render(instance, node)).not.toThrow();
@@ -312,7 +311,7 @@ describe('ReactDOMInput', function() {
311 });
312
313 it('should support checkedLink', function() {
315 - var link = new ReactLink(true, mocks.getMockFunction());
314 + var link = new ReactLink(true, jest.genMockFn());
315 var instance = <input type="checkbox" checkedLink={link} />;
316
317 instance = ReactTestUtils.renderIntoDocument(instance);
@@ -330,7 +329,7 @@ describe('ReactDOMInput', function() {
329
330 it('should warn with checked and no onChange handler', function() {
331 var node = document.createElement('div');
333 - var link = new ReactLink(true, mocks.getMockFunction());
332 + var link = new ReactLink(true, jest.genMockFn());
333 ReactDOM.render(<input type="checkbox" checkedLink={link} />, node);
334 expect(console.error.argsForCall.length).toBe(1);
335 expect(console.error.argsForCall[0][0]).toContain(
@@ -341,7 +340,7 @@ describe('ReactDOMInput', function() {
340 <input
341 type="checkbox"
342 checked="false"
344 - onChange={mocks.getMockFunction()}
343 + onChange={jest.genMockFn()}
344 />
345 );
346 expect(console.error.argsForCall.length).toBe(1);
@@ -369,7 +368,7 @@ describe('ReactDOMInput', function() {
368
369 it('should throw if both checked and checkedLink are provided', function() {
370 var node = document.createElement('div');
372 - var link = new ReactLink(true, mocks.getMockFunction());
371 + var link = new ReactLink(true, jest.genMockFn());
372 var instance = <input type="checkbox" checkedLink={link} />;
373
374 expect(() => ReactDOM.render(instance, node)).not.toThrow();
@@ -391,7 +390,7 @@ describe('ReactDOMInput', function() {
390
391 it('should throw if both checkedLink and valueLink are provided', function() {
392 var node = document.createElement('div');
394 - var link = new ReactLink(true, mocks.getMockFunction());
393 + var link = new ReactLink(true, jest.genMockFn());
394 var instance = <input type="checkbox" checkedLink={link} />;
395
396 expect(() => ReactDOM.render(instance, node)).not.toThrow();
src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js
+1 -3
@@ -12,8 +12,6 @@
12 'use strict';
13
14
15 -var mocks = require('mocks');
16 -
15 describe('ReactDOMSelect', function() {
16 var React;
17 var ReactDOM;
@@ -350,7 +348,7 @@ describe('ReactDOMSelect', function() {
348 });
349
350 it('should support ReactLink', function() {
353 - var link = new ReactLink('giraffe', mocks.getMockFunction());
351 + var link = new ReactLink('giraffe', jest.genMockFn());
352 var stub =
353 <select valueLink={link}>
354 <option value="monkey">A monkey!</option>
src/renderers/dom/client/wrappers/__tests__/ReactDOMTextarea-test.js
+1 -2
@@ -12,7 +12,6 @@
12 'use strict';
13
14 var emptyFunction = require('emptyFunction');
15 -var mocks = require('mocks');
15
16 describe('ReactDOMTextarea', function() {
17 var React;
@@ -238,7 +237,7 @@ describe('ReactDOMTextarea', function() {
237 });
238
239 it('should support ReactLink', function() {
241 - var link = new ReactLink('yolo', mocks.getMockFunction());
240 + var link = new ReactLink('yolo', jest.genMockFn());
241 var instance = <textarea valueLink={link} />;
242
243 spyOn(console, 'error');
src/renderers/dom/server/__tests__/ReactServerRendering-test.js
+3 -5
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -var mocks = require('mocks');
15 -
14 var ExecutionEnvironment;
15 var React;
16 var ReactDOM;
@@ -25,7 +23,7 @@ var ID_ATTRIBUTE_NAME;
23
24 describe('ReactServerRendering', function() {
25 beforeEach(function() {
28 - require('mock-modules').dumpCache();
26 + jest.resetModuleRegistry();
27 React = require('React');
28 ReactDOM = require('ReactDOM');
29 ReactMarkupChecksum = require('ReactMarkupChecksum');
@@ -74,7 +72,7 @@ describe('ReactServerRendering', function() {
72
73 it('should not register event listeners', function() {
74 var EventPluginHub = require('EventPluginHub');
77 - var cb = mocks.getMockFunction();
75 + var cb = jest.genMockFn();
76
77 ReactServerRendering.renderToString(
78 <span onClick={cb}>hello world</span>
@@ -288,7 +286,7 @@ describe('ReactServerRendering', function() {
286
287 it('should not register event listeners', function() {
288 var EventPluginHub = require('EventPluginHub');
291 - var cb = mocks.getMockFunction();
289 + var cb = jest.genMockFn();
290
291 ReactServerRendering.renderToString(
292 <span onClick={cb}>hello world</span>
src/renderers/dom/shared/__tests__/CSSProperty-test.js
+1 -1
@@ -15,7 +15,7 @@ describe('CSSProperty', function() {
15 var CSSProperty;
16
17 beforeEach(function() {
18 - require('mock-modules').dumpCache();
18 + jest.resetModuleRegistry();
19 CSSProperty = require('CSSProperty');
20 });
21
src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
+1 -1
@@ -19,7 +19,7 @@ describe('CSSPropertyOperations', function() {
19 var CSSPropertyOperations;
20
21 beforeEach(function() {
22 - require('mock-modules').dumpCache();
22 + jest.resetModuleRegistry();
23 CSSPropertyOperations = require('CSSPropertyOperations');
24 });
25
src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
+2 -2
@@ -18,7 +18,7 @@ describe('DOMPropertyOperations', function() {
18 var mocks;
19
20 beforeEach(function() {
21 - require('mock-modules').dumpCache();
21 + jest.resetModuleRegistry();
22 var ReactDefaultInjection = require('ReactDefaultInjection');
23 ReactDefaultInjection.inject();
24
@@ -270,7 +270,7 @@ describe('DOMPropertyOperations', function() {
270 });
271
272 it('should use mutation method where applicable', function() {
273 - var foobarSetter = mocks.getMockFunction();
273 + var foobarSetter = jest.genMockFn();
274 // inject foobar DOM property
275 DOMProperty.injection.injectDOMPropertyConfig({
276 Properties: {foobar: null},
src/renderers/dom/shared/__tests__/Danger-test.js
+1 -1
@@ -17,7 +17,7 @@ describe('Danger', function() {
17 var Danger;
18
19 beforeEach(function() {
20 - require('mock-modules').dumpCache();
20 + jest.resetModuleRegistry();
21 Danger = require('Danger');
22 });
23
src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+8 -10
@@ -12,7 +12,6 @@
12 'use strict';
13
14 var assign = require('Object.assign');
15 -var mocks = require('mocks');
15
16 describe('ReactDOMComponent', function() {
17 var React;
@@ -21,7 +20,7 @@ describe('ReactDOMComponent', function() {
20 var ReactDOMServer;
21
22 beforeEach(function() {
24 - require('mock-modules').dumpCache();
23 + jest.resetModuleRegistry();
24 React = require('React');
25 ReactDOM = require('ReactDOM');
26 ReactDOMServer = require('ReactDOMServer');
@@ -404,7 +403,7 @@ describe('ReactDOMComponent', function() {
403
404 var node = container.firstChild;
405 var nodeValue = ''; // node.value always returns undefined
407 - var nodeValueSetter = mocks.getMockFunction();
406 + var nodeValueSetter = jest.genMockFn();
407 Object.defineProperty(node, 'value', {
408 get: function() {
409 return nodeValue;
@@ -431,7 +430,7 @@ describe('ReactDOMComponent', function() {
430 var container = document.createElement('div');
431 var node = ReactDOM.render(<div />, container);
432
434 - var setter = mocks.getMockFunction();
433 + var setter = jest.genMockFn();
434 node.setAttribute = setter;
435
436 ReactDOM.render(<div dir={null} />, container);
@@ -659,8 +658,8 @@ describe('ReactDOMComponent', function() {
658 it('should execute custom event plugin listening behavior', function() {
659 var SimpleEventPlugin = require('SimpleEventPlugin');
660
662 - SimpleEventPlugin.didPutListener = mocks.getMockFunction();
663 - SimpleEventPlugin.willDeleteListener = mocks.getMockFunction();
661 + SimpleEventPlugin.didPutListener = jest.genMockFn();
662 + SimpleEventPlugin.willDeleteListener = jest.genMockFn();
663
664 var container = document.createElement('div');
665 ReactDOM.render(
@@ -678,8 +677,8 @@ describe('ReactDOMComponent', function() {
677 it('should handle null and missing properly with event hooks', function() {
678 var SimpleEventPlugin = require('SimpleEventPlugin');
679
681 - SimpleEventPlugin.didPutListener = mocks.getMockFunction();
682 - SimpleEventPlugin.willDeleteListener = mocks.getMockFunction();
680 + SimpleEventPlugin.didPutListener = jest.genMockFn();
681 + SimpleEventPlugin.willDeleteListener = jest.genMockFn();
682 var container = document.createElement('div');
683
684 ReactDOM.render(<div onClick={false} />, container);
@@ -858,8 +857,7 @@ describe('ReactDOMComponent', function() {
857 it('should warn about the `onScroll` issue when unsupported (IE8)', () => {
858 // Mock this here so we can mimic IE8 support. We require isEventSupported
859 // before React so it's pre-mocked before React qould require it.
861 - require('mock-modules')
862 - .dumpCache()
860 + jest.resetModuleRegistry()
861 .mock('isEventSupported');
862 var isEventSupported = require('isEventSupported');
863 isEventSupported.mockReturnValueOnce(false);
src/renderers/shared/event/__tests__/EventPluginHub-test.js
+2 -2
@@ -11,7 +11,7 @@
11
12 'use strict';
13
14 -require('mock-modules')
14 +jest
15 .dontMock('EventPluginHub')
16 .mock('isEventSupported');
17
@@ -20,7 +20,7 @@ describe('EventPluginHub', function() {
20 var isEventSupported;
21
22 beforeEach(function() {
23 - require('mock-modules').dumpCache();
23 + jest.resetModuleRegistry();
24 EventPluginHub = require('EventPluginHub');
25 isEventSupported = require('isEventSupported');
26 isEventSupported.mockReturnValueOnce(false);
src/renderers/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
+1 -1
@@ -330,7 +330,7 @@ var siblings = {
330
331 describe('ResponderEventPlugin', function() {
332 beforeEach(function() {
333 - require('mock-modules').dumpCache();
333 + jest.resetModuleRegistry();
334
335 EventConstants = require('EventConstants');
336 EventPluginHub = require('EventPluginHub');
src/renderers/shared/reconciler/__tests__/ReactComponent-test.js
+1 -1
@@ -258,7 +258,7 @@ describe('ReactComponent', function() {
258 });
259
260 it('fires the callback after a component is rendered', function() {
261 - var callback = mocks.getMockFunction();
261 + var callback = jest.genMockFn();
262 var container = document.createElement('div');
263 ReactDOM.render(<div />, container, callback);
264 expect(callback.mock.calls.length).toBe(1);
src/renderers/shared/reconciler/__tests__/ReactComponentLifeCycle-test.js
+1 -1
@@ -98,7 +98,7 @@ function getLifeCycleState(instance) {
98 */
99 describe('ReactComponentLifeCycle', function() {
100 beforeEach(function() {
101 - require('mock-modules').dumpCache();
101 + jest.resetModuleRegistry();
102 React = require('React');
103 ReactDOM = require('ReactDOM');
104 ReactTestUtils = require('ReactTestUtils');
src/renderers/shared/reconciler/__tests__/ReactCompositeComponent-test.js
+1 -1
@@ -27,7 +27,7 @@ var reactComponentExpect;
27 describe('ReactCompositeComponent', function() {
28
29 beforeEach(function() {
30 - require('mock-modules').dumpCache();
30 + jest.resetModuleRegistry();
31 reactComponentExpect = require('reactComponentExpect');
32 React = require('React');
33 ReactDOM = require('ReactDOM');
src/renderers/shared/reconciler/__tests__/ReactCompositeComponentNestedState-test.js
+1 -3
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -var mocks = require('mocks');
15 -
14 var React;
15 var ReactDOM;
16 var ReactTestUtils;
@@ -92,7 +90,7 @@ describe('ReactCompositeComponentNestedState-state', function() {
90 var container = document.createElement('div');
91 document.body.appendChild(container);
92
95 - var logger = mocks.getMockFunction();
93 + var logger = jest.genMockFn();
94
95 void ReactDOM.render(
96 <ParentComponent logger={logger} />,
src/renderers/shared/reconciler/__tests__/ReactCompositeComponentState-test.js
+1 -3
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -var mocks = require('mocks');
15 -
14 var React;
15 var ReactDOM;
16
@@ -132,7 +130,7 @@ describe('ReactCompositeComponent-state', function() {
130 var container = document.createElement('div');
131 document.body.appendChild(container);
132
135 - var stateListener = mocks.getMockFunction();
133 + var stateListener = jest.genMockFn();
134 var instance = ReactDOM.render(
135 <TestComponent stateListener={stateListener} />,
136 container,
src/renderers/shared/reconciler/__tests__/ReactEmptyComponent-test.js
+1 -1
@@ -20,7 +20,7 @@ var reactComponentExpect;
20
21 describe('ReactEmptyComponent', function() {
22 beforeEach(function() {
23 - require('mock-modules').dumpCache();
23 + jest.resetModuleRegistry();
24
25 React = require('React');
26 ReactDOM = require('ReactDOM');
src/renderers/shared/reconciler/__tests__/ReactIdentity-test.js
+1 -1
@@ -20,7 +20,7 @@ var ReactMount;
20 describe('ReactIdentity', function() {
21
22 beforeEach(function() {
23 - require('mock-modules').dumpCache();
23 + jest.resetModuleRegistry();
24 React = require('React');
25 ReactDOM = require('ReactDOM');
26 ReactFragment = require('ReactFragment');
src/renderers/shared/reconciler/__tests__/ReactMultiChild-test.js
+10 -12
@@ -11,15 +11,13 @@
11
12 'use strict';
13
14 -var mocks = require('mocks');
15 -
14 describe('ReactMultiChild', function() {
15 var React;
16
17 var ReactDOM;
18
19 beforeEach(function() {
22 - require('mock-modules').dumpCache();
20 + jest.resetModuleRegistry();
21 React = require('React');
22 ReactDOM = require('ReactDOM');
23 });
@@ -28,9 +26,9 @@ describe('ReactMultiChild', function() {
26 it('should update children when possible', function() {
27 var container = document.createElement('div');
28
31 - var mockMount = mocks.getMockFunction();
32 - var mockUpdate = mocks.getMockFunction();
33 - var mockUnmount = mocks.getMockFunction();
29 + var mockMount = jest.genMockFn();
30 + var mockUpdate = jest.genMockFn();
31 + var mockUnmount = jest.genMockFn();
32
33 var MockComponent = React.createClass({
34 componentDidMount: mockMount,
@@ -61,8 +59,8 @@ describe('ReactMultiChild', function() {
59 it('should replace children with different constructors', function() {
60 var container = document.createElement('div');
61
64 - var mockMount = mocks.getMockFunction();
65 - var mockUnmount = mocks.getMockFunction();
62 + var mockMount = jest.genMockFn();
63 + var mockUnmount = jest.genMockFn();
64
65 var MockComponent = React.createClass({
66 componentDidMount: mockMount,
@@ -89,8 +87,8 @@ describe('ReactMultiChild', function() {
87 it('should NOT replace children with different owners', function() {
88 var container = document.createElement('div');
89
92 - var mockMount = mocks.getMockFunction();
93 - var mockUnmount = mocks.getMockFunction();
90 + var mockMount = jest.genMockFn();
91 + var mockUnmount = jest.genMockFn();
92
93 var MockComponent = React.createClass({
94 componentDidMount: mockMount,
@@ -126,8 +124,8 @@ describe('ReactMultiChild', function() {
124 it('should replace children with different keys', function() {
125 var container = document.createElement('div');
126
129 - var mockMount = mocks.getMockFunction();
130 - var mockUnmount = mocks.getMockFunction();
127 + var mockMount = jest.genMockFn();
128 + var mockUnmount = jest.genMockFn();
129
130 var MockComponent = React.createClass({
131 componentDidMount: mockMount,
src/renderers/shared/reconciler/__tests__/ReactMultiChildReconcile-test.js
+1 -3
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -require('mock-modules');
15 -
14 var React = require('React');
15 var ReactDOM = require('ReactDOM');
16 var ReactInstanceMap = require('ReactInstanceMap');
@@ -237,7 +235,7 @@ function testPropsSequence(sequence) {
235
236 describe('ReactMultiChildReconcile', function() {
237 beforeEach(function() {
240 - require('mock-modules').dumpCache();
238 + jest.resetModuleRegistry();
239 });
240
241 it('should reset internal state if removed then readded', function() {
src/renderers/shared/reconciler/__tests__/ReactMultiChildText-test.js
-2
@@ -11,8 +11,6 @@
11
12 'use strict';
13
14 -require('mock-modules');
15 -
14 var React = require('React');
15 var ReactDOM = require('ReactDOM');
16 var ReactTestUtils = require('ReactTestUtils');
src/renderers/shared/reconciler/__tests__/ReactStateSetters-test.js
+1 -1
@@ -20,7 +20,7 @@ var TestComponentWithMixin;
20
21 describe('ReactStateSetters', function() {
22 beforeEach(function() {
23 - require('mock-modules').dumpCache();
23 + jest.resetModuleRegistry();
24
25 TestComponent = React.createClass({
26 getInitialState: function() {
src/renderers/shared/reconciler/__tests__/refs-destruction-test.js
+1 -1
@@ -19,7 +19,7 @@ var TestComponent;
19
20 describe('refs-destruction', function() {
21 beforeEach(function() {
22 - require('mock-modules').dumpCache();
22 + jest.resetModuleRegistry();
23
24 React = require('React');
25 ReactDOM = require('ReactDOM');
src/renderers/shared/reconciler/__tests__/refs-test.js
+2 -2
@@ -115,7 +115,7 @@ var expectClickLogsLengthToBe = function(instance, length) {
115
116 describe('reactiverefs', function() {
117 beforeEach(function() {
118 - require('mock-modules').dumpCache();
118 + jest.resetModuleRegistry();
119 });
120
121 /**
@@ -158,7 +158,7 @@ describe('reactiverefs', function() {
158 */
159 describe('ref swapping', function() {
160 beforeEach(function() {
161 - require('mock-modules').dumpCache();
161 + jest.resetModuleRegistry();
162 });
163
164 var RefHopsAround = React.createClass({
src/shared/utils/__tests__/OrderedMap-test.js
+1 -1
@@ -134,7 +134,7 @@ var extractUniqueID = function(entity) {
134
135 describe('OrderedMap', function() {
136 beforeEach(function() {
137 - require('mock-modules').dumpCache();
137 + jest.resetModuleRegistry();
138 OrderedMap = require('OrderedMap');
139 });
140
src/shared/utils/__tests__/Transaction-test.js
+1 -1
@@ -18,7 +18,7 @@ var Transaction;
18 var INIT_ERRORED = 'initErrored'; // Just a dummy value to check for.
19 describe('Transaction', function() {
20 beforeEach(function() {
21 - require('mock-modules').dumpCache();
21 + jest.resetModuleRegistry();
22 Transaction = require('Transaction');
23 });
24
src/shared/utils/__tests__/accumulateInto-test.js
+1 -1
@@ -11,7 +11,7 @@
11
12 'use strict';
13
14 -require('mock-modules')
14 +jest
15 .dontMock('accumulateInto');
16
17 var accumulateInto;
src/shared/utils/__tests__/traverseAllChildren-test.js
+1 -1
@@ -16,7 +16,7 @@ describe('traverseAllChildren', function() {
16 var React;
17 var ReactFragment;
18 beforeEach(function() {
19 - require('mock-modules').dumpCache();
19 + jest.resetModuleRegistry();
20 traverseAllChildren = require('traverseAllChildren');
21 React = require('React');
22 ReactFragment = require('ReactFragment');
src/test/__tests__/ReactDefaultPerf-test.js
+1 -1
@@ -24,7 +24,7 @@ describe('ReactDefaultPerf', function() {
24
25 beforeEach(function() {
26 var now = 0;
27 - require('mock-modules').setMock('performanceNow', function() {
27 + jest.setMock('performanceNow', function() {
28 return now++;
29 });
30
src/test/__tests__/ReactTestUtils-test.js
+1 -1
@@ -75,7 +75,7 @@ describe('ReactTestUtils', function() {
75 });
76
77 it('should have shallow unmounting', function() {
78 - var componentWillUnmount = mocks.getMockFunction();
78 + var componentWillUnmount = jest.genMockFn();
79
80 var SomeComponent = React.createClass({
81 render: function() {