{"patch":"diff --git a\/grunt\/tasks\/jest.js b\/grunt\/tasks\/jest.js\nindex da406e9111..fb8c1113ab 100644\n--- a\/grunt\/tasks\/jest.js\n+++ b\/grunt\/tasks\/jest.js\n@@ -77,7 +77,7 @@ function writeTempConfig(callback) {\n function run(done, configPath) {\n grunt.log.writeln('running jest (this may take a while)');\n \n- var args = ['--harmony', path.join('node_modules', 'jest-cli', 'bin', 'jest')];\n+ var args = ['--harmony', path.join('node_modules', 'jest-cli', 'bin', 'jest'), '--runInBand'];\n if (configPath) {\n args.push('--config', configPath);\n }\ndiff --git a\/package.json b\/package.json\nindex c651733353..19f70bd7ca 100644\n--- a\/package.json\n+++ b\/package.json\n@@ -48,7 +48,7 @@\n \"gulp-babel\": \"^6.0.0\",\n \"gulp-flatten\": \"^0.2.0\",\n \"gzip-js\": \"~0.3.2\",\n- \"jest-cli\": \"^0.9.0\",\n+ \"jest-cli\": \"^12.0.2\",\n \"loose-envify\": \"^1.1.0\",\n \"object-assign\": \"^4.0.1\",\n \"platform\": \"^1.1.0\",\ndiff --git a\/src\/core\/__tests__\/ReactErrorBoundaries-test.js b\/src\/core\/__tests__\/ReactErrorBoundaries-test.js\nindex 0ba37323d5..7c8de2daf5 100644\n--- a\/src\/core\/__tests__\/ReactErrorBoundaries-test.js\n+++ b\/src\/core\/__tests__\/ReactErrorBoundaries-test.js\n@@ -50,7 +50,7 @@ describe('ReactErrorBoundaries', function() {\n \n var EventPluginHub = require('EventPluginHub');\n var container = document.createElement('div');\n- EventPluginHub.putListener = jest.genMockFn();\n+ EventPluginHub.putListener = jest.fn();\n ReactDOM.render(, container);\n expect(EventPluginHub.putListener).not.toBeCalled();\n });\n@@ -120,7 +120,7 @@ describe('ReactErrorBoundaries', function() {\n \n var EventPluginHub = require('EventPluginHub');\n var container = document.createElement('div');\n- EventPluginHub.putListener = jest.genMockFn();\n+ EventPluginHub.putListener = jest.fn();\n ReactDOM.render(, container);\n expect(EventPluginHub.putListener).toBeCalled();\n });\ndiff --git a\/src\/isomorphic\/classic\/class\/__tests__\/ReactBind-test.js b\/src\/isomorphic\/classic\/class\/__tests__\/ReactBind-test.js\nindex 63aa641a9c..bbf9d0c7da 100644\n--- a\/src\/isomorphic\/classic\/class\/__tests__\/ReactBind-test.js\n+++ b\/src\/isomorphic\/classic\/class\/__tests__\/ReactBind-test.js\n@@ -20,9 +20,9 @@ describe('autobinding', function() {\n \n it('Holds reference to instance', function() {\n \n- var mouseDidEnter = jest.genMockFn();\n- var mouseDidLeave = jest.genMockFn();\n- var mouseDidClick = jest.genMockFn();\n+ var mouseDidEnter = jest.fn();\n+ var mouseDidLeave = jest.fn();\n+ var mouseDidClick = jest.fn();\n \n var TestBindComponent = React.createClass({\n getInitialState: function() {\n@@ -95,7 +95,7 @@ describe('autobinding', function() {\n });\n \n it('works with mixins', function() {\n- var mouseDidClick = jest.genMockFn();\n+ var mouseDidClick = jest.fn();\n \n var TestMixin = {\n onClick: mouseDidClick,\ndiff --git a\/src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js b\/src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js\nindex 395e345770..54d3c11f5c 100644\n--- a\/src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js\n+++ b\/src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js\n@@ -20,9 +20,9 @@ describe('autobind optout', function() {\n \n it('should work with manual binding', function() {\n \n- var mouseDidEnter = jest.genMockFn();\n- var mouseDidLeave = jest.genMockFn();\n- var mouseDidClick = jest.genMockFn();\n+ var mouseDidEnter = jest.fn();\n+ var mouseDidLeave = jest.fn();\n+ var mouseDidClick = jest.fn();\n \n var TestBindComponent = React.createClass({\n autobind: false,\n@@ -138,7 +138,7 @@ describe('autobind optout', function() {\n });\n \n it('works with mixins that have not opted out of autobinding', function() {\n- var mouseDidClick = jest.genMockFn();\n+ var mouseDidClick = jest.fn();\n \n var TestMixin = {\n onClick: mouseDidClick,\n@@ -164,7 +164,7 @@ describe('autobind optout', function() {\n });\n \n it('works with mixins that have opted out of autobinding', function() {\n- var mouseDidClick = jest.genMockFn();\n+ var mouseDidClick = jest.fn();\n \n var TestMixin = {\n autobind: false,\ndiff --git a\/src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js b\/src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js\nindex 07a1e4bcb3..9a5587f7b7 100644\n--- a\/src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js\n+++ b\/src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js\n@@ -43,7 +43,7 @@ describe('ReactClass-spec', function() {\n });\n \n it('should copy prop types onto the Constructor', function() {\n- var propValidator = jest.genMockFn();\n+ var propValidator = jest.fn();\n var TestComponent = React.createClass({\n propTypes: {\n value: propValidator,\ndiff --git a\/src\/isomorphic\/classic\/class\/__tests__\/ReactClassMixin-test.js b\/src\/isomorphic\/classic\/class\/__tests__\/ReactClassMixin-test.js\nindex a65c68ff07..f32af1e046 100644\n--- a\/src\/isomorphic\/classic\/class\/__tests__\/ReactClassMixin-test.js\n+++ b\/src\/isomorphic\/classic\/class\/__tests__\/ReactClassMixin-test.js\n@@ -25,8 +25,8 @@ describe('ReactClass-mixin', function() {\n beforeEach(function() {\n React = require('React');\n ReactTestUtils = require('ReactTestUtils');\n- mixinPropValidator = jest.genMockFn();\n- componentPropValidator = jest.genMockFn();\n+ mixinPropValidator = jest.fn();\n+ componentPropValidator = jest.fn();\n \n var MixinA = {\n propTypes: {\n@@ -107,7 +107,7 @@ describe('ReactClass-mixin', function() {\n });\n \n it('should support merging propTypes and statics', function() {\n- var listener = jest.genMockFn();\n+ var listener = jest.fn();\n var instance = ;\n instance = ReactTestUtils.renderIntoDocument(instance);\n \n@@ -122,7 +122,7 @@ describe('ReactClass-mixin', function() {\n });\n \n it('should support chaining delegate functions', function() {\n- var listener = jest.genMockFn();\n+ var listener = jest.fn();\n var instance = ;\n instance = ReactTestUtils.renderIntoDocument(instance);\n \n@@ -135,7 +135,7 @@ describe('ReactClass-mixin', function() {\n });\n \n it('should chain functions regardless of spec property order', function() {\n- var listener = jest.genMockFn();\n+ var listener = jest.fn();\n var instance = ;\n instance = ReactTestUtils.renderIntoDocument(instance);\n \ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js\nindex 5dbf91c2cd..9de6b2e8e2 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js\n@@ -35,7 +35,7 @@ var recordIDAndReturnFalse = function(id, event) {\n recordID(id);\n return false;\n };\n-var LISTENER = jest.genMockFn();\n+var LISTENER = jest.fn();\n var ON_CLICK_KEY = keyOf({onClick: null});\n var ON_TOUCH_TAP_KEY = keyOf({onTouchTap: null});\n var ON_CHANGE_KEY = keyOf({onChange: null});\n@@ -284,7 +284,7 @@ describe('ReactBrowserEventEmitter', function() {\n *\/\n \n it('should invoke handlers that were removed while bubbling', function() {\n- var handleParentClick = jest.genMockFn();\n+ var handleParentClick = jest.fn();\n var handleChildClick = function(event) {\n EventPluginHub.deleteAllListeners(getInternal(PARENT));\n };\n@@ -303,7 +303,7 @@ describe('ReactBrowserEventEmitter', function() {\n });\n \n it('should not invoke newly inserted handlers while bubbling', function() {\n- var handleParentClick = jest.genMockFn();\n+ var handleParentClick = jest.fn();\n var handleChildClick = function(event) {\n EventPluginHub.putListener(\n getInternal(PARENT),\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactEventListener-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactEventListener-test.js\nindex 49d4f195d5..049284f8f7 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactEventListener-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactEventListener-test.js\n@@ -30,7 +30,7 @@ describe('ReactEventListener', function() {\n ReactEventListener = require('ReactEventListener');\n ReactTestUtils = require('ReactTestUtils');\n \n- handleTopLevel = jest.genMockFn();\n+ handleTopLevel = jest.fn();\n ReactEventListener._handleTopLevel = handleTopLevel;\n });\n \ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\nindex 06b1c16415..96ca4aef33 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\n@@ -87,8 +87,8 @@ describe('ReactMount', function() {\n it('should unmount and remount if the key changes', function() {\n var container = document.createElement('container');\n \n- var mockMount = jest.genMockFn();\n- var mockUnmount = jest.genMockFn();\n+ var mockMount = jest.fn();\n+ var mockUnmount = jest.fn();\n \n var Component = React.createClass({\n componentDidMount: mockMount,\ndiff --git a\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js b\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\nindex 0f032902d4..46e21b96ce 100644\n--- a\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\n+++ b\/src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js\n@@ -66,7 +66,7 @@ describe('SelectEventPlugin', function() {\n },\n });\n \n- var cb = jest.genMockFn();\n+ var cb = jest.fn();\n \n var rendered = ReactTestUtils.renderIntoDocument(\n \ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/DisabledInputUtil-test.js b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/DisabledInputUtil-test.js\nindex 0e4c77d556..a99546ecc2 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/DisabledInputUtil-test.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/DisabledInputUtil-test.js\n@@ -36,7 +36,7 @@ describe('DisabledInputUtils', function() {\n return element;\n }\n \n- var onClick = jest.genMockFn();\n+ var onClick = jest.fn();\n \n elements.forEach(function(tagName) {\n \ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js\nindex 7db938bfc5..f7ff9328a6 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js\n@@ -245,7 +245,7 @@ describe('ReactDOMInput', function() {\n });\n \n it('should support ReactLink', function() {\n- var link = new ReactLink('yolo', jest.genMockFn());\n+ var link = new ReactLink('yolo', jest.fn());\n var instance = ;\n \n instance = ReactTestUtils.renderIntoDocument(instance);\n@@ -262,7 +262,7 @@ describe('ReactDOMInput', function() {\n });\n \n it('should warn with value and no onChange handler', function() {\n- var link = new ReactLink('yolo', jest.genMockFn());\n+ var link = new ReactLink('yolo', jest.fn());\n ReactTestUtils.renderIntoDocument();\n expect(console.error.argsForCall.length).toBe(1);\n expect(console.error.argsForCall[0][0]).toContain(\n@@ -270,7 +270,7 @@ describe('ReactDOMInput', function() {\n );\n \n ReactTestUtils.renderIntoDocument(\n- \n+ \n );\n expect(console.error.argsForCall.length).toBe(1);\n ReactTestUtils.renderIntoDocument();\n@@ -302,7 +302,7 @@ describe('ReactDOMInput', function() {\n \n it('should throw if both value and valueLink are provided', function() {\n var node = document.createElement('div');\n- var link = new ReactLink('yolo', jest.genMockFn());\n+ var link = new ReactLink('yolo', jest.fn());\n var instance = ;\n \n expect(() => ReactDOM.render(instance, node)).not.toThrow();\n@@ -322,7 +322,7 @@ describe('ReactDOMInput', function() {\n });\n \n it('should support checkedLink', function() {\n- var link = new ReactLink(true, jest.genMockFn());\n+ var link = new ReactLink(true, jest.fn());\n var instance = ;\n \n instance = ReactTestUtils.renderIntoDocument(instance);\n@@ -340,7 +340,7 @@ describe('ReactDOMInput', function() {\n \n it('should warn with checked and no onChange handler', function() {\n var node = document.createElement('div');\n- var link = new ReactLink(true, jest.genMockFn());\n+ var link = new ReactLink(true, jest.fn());\n ReactDOM.render(, node);\n expect(console.error.argsForCall.length).toBe(1);\n expect(console.error.argsForCall[0][0]).toContain(\n@@ -351,7 +351,7 @@ describe('ReactDOMInput', function() {\n \n );\n expect(console.error.argsForCall.length).toBe(1);\n@@ -379,7 +379,7 @@ describe('ReactDOMInput', function() {\n \n it('should throw if both checked and checkedLink are provided', function() {\n var node = document.createElement('div');\n- var link = new ReactLink(true, jest.genMockFn());\n+ var link = new ReactLink(true, jest.fn());\n var instance = ;\n \n expect(() => ReactDOM.render(instance, node)).not.toThrow();\n@@ -401,7 +401,7 @@ describe('ReactDOMInput', function() {\n \n it('should throw if both checkedLink and valueLink are provided', function() {\n var node = document.createElement('div');\n- var link = new ReactLink(true, jest.genMockFn());\n+ var link = new ReactLink(true, jest.fn());\n var instance = ;\n \n expect(() => ReactDOM.render(instance, node)).not.toThrow();\ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js\nindex 0a3f530283..c4276c143f 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js\n@@ -348,7 +348,7 @@ describe('ReactDOMSelect', function() {\n });\n \n it('should support ReactLink', function() {\n- var link = new ReactLink('giraffe', jest.genMockFn());\n+ var link = new ReactLink('giraffe', jest.fn());\n var stub =\n

;\n \n     spyOn(console, 'error');\ndiff --git a\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js b\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\nindex c53b0be742..c679e03793 100644\n--- a\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\n+++ b\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\n@@ -86,7 +86,7 @@ describe('ReactServerRendering', function() {\n \n     it('should not register event listeners', function() {\n       var EventPluginHub = require('EventPluginHub');\n-      var cb = jest.genMockFn();\n+      var cb = jest.fn();\n \n       ReactServerRendering.renderToString(\n         <span onClick={cb}>hello world<\/span>\n@@ -303,7 +303,7 @@ describe('ReactServerRendering', function() {\n \n     it('should not register event listeners', function() {\n       var EventPluginHub = require('EventPluginHub');\n-      var cb = jest.genMockFn();\n+      var cb = jest.fn();\n \n       ReactServerRendering.renderToString(\n         <span onClick={cb}>hello world<\/span>\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/DOMPropertyOperations-test.js b\/src\/renderers\/dom\/shared\/__tests__\/DOMPropertyOperations-test.js\nindex 08bb3e455e..4f8f82cb10 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/DOMPropertyOperations-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/DOMPropertyOperations-test.js\n@@ -259,7 +259,7 @@ describe('DOMPropertyOperations', function() {\n     });\n \n     it('should use mutation method where applicable', function() {\n-      var foobarSetter = jest.genMockFn();\n+      var foobarSetter = jest.fn();\n       \/\/ inject foobar DOM property\n       DOMProperty.injection.injectDOMPropertyConfig({\n         Properties: {foobar: null},\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\nindex c0af2cc4a5..36dba2bdd2 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n@@ -450,11 +450,11 @@ describe('ReactDOMComponent', function() {\n \n       var node = container.firstChild;\n       var nodeSetAttribute = node.setAttribute;\n-      node.setAttribute = jest.genMockFn();\n+      node.setAttribute = jest.fn();\n       node.setAttribute.mockImpl(nodeSetAttribute);\n \n       var nodeRemoveAttribute = node.removeAttribute;\n-      node.removeAttribute = jest.genMockFn();\n+      node.removeAttribute = jest.fn();\n       node.removeAttribute.mockImpl(nodeRemoveAttribute);\n \n       ReactDOM.render(<div id=\"\" \/>, container);\n@@ -488,7 +488,7 @@ describe('ReactDOMComponent', function() {\n \n       var node = container.firstChild;\n       var nodeValue = ''; \/\/ node.value always returns undefined\n-      var nodeValueSetter = jest.genMockFn();\n+      var nodeValueSetter = jest.fn();\n       Object.defineProperty(node, 'value', {\n         get: function() {\n           return nodeValue;\n@@ -519,7 +519,7 @@ describe('ReactDOMComponent', function() {\n \n       var node = container.firstChild;\n       var nodeValue = true;\n-      var nodeValueSetter = jest.genMockFn();\n+      var nodeValueSetter = jest.fn();\n       Object.defineProperty(node, 'checked', {\n         get: function() {\n           return nodeValue;\n@@ -552,7 +552,7 @@ describe('ReactDOMComponent', function() {\n       var container = document.createElement('div');\n       var node = ReactDOM.render(<div \/>, container);\n \n-      var setter = jest.genMockFn();\n+      var setter = jest.fn();\n       node.setAttribute = setter;\n \n       ReactDOM.render(<div dir={null} \/>, container);\n@@ -839,8 +839,8 @@ describe('ReactDOMComponent', function() {\n     it('should execute custom event plugin listening behavior', function() {\n       var SimpleEventPlugin = require('SimpleEventPlugin');\n \n-      SimpleEventPlugin.didPutListener = jest.genMockFn();\n-      SimpleEventPlugin.willDeleteListener = jest.genMockFn();\n+      SimpleEventPlugin.didPutListener = jest.fn();\n+      SimpleEventPlugin.willDeleteListener = jest.fn();\n \n       var container = document.createElement('div');\n       ReactDOM.render(\n@@ -858,8 +858,8 @@ describe('ReactDOMComponent', function() {\n     it('should handle null and missing properly with event hooks', function() {\n       var SimpleEventPlugin = require('SimpleEventPlugin');\n \n-      SimpleEventPlugin.didPutListener = jest.genMockFn();\n-      SimpleEventPlugin.willDeleteListener = jest.genMockFn();\n+      SimpleEventPlugin.didPutListener = jest.fn();\n+      SimpleEventPlugin.willDeleteListener = jest.fn();\n       var container = document.createElement('div');\n \n       ReactDOM.render(<div onClick={false} \/>, container);\ndiff --git a\/src\/renderers\/native\/ReactNative\/__mocks__\/UIManager.js b\/src\/renderers\/native\/ReactNative\/__mocks__\/UIManager.js\nindex 0c51ab6e6b..8f845f710b 100644\n--- a\/src\/renderers\/native\/ReactNative\/__mocks__\/UIManager.js\n+++ b\/src\/renderers\/native\/ReactNative\/__mocks__\/UIManager.js\n@@ -12,10 +12,10 @@\n \/\/ Mock of the Native Hooks\n \n var RCTUIManager = {\n-  createView: jest.genMockFunction(),\n-  setChildren: jest.genMockFunction(),\n-  manageChildren: jest.genMockFunction(),\n-  updateView: jest.genMockFunction(),\n+  createView: jest.fn(),\n+  setChildren: jest.fn(),\n+  manageChildren: jest.fn(),\n+  updateView: jest.fn(),\n };\n \n module.exports = RCTUIManager;\ndiff --git a\/src\/renderers\/native\/ReactNative\/__tests__\/ReactNativeAttributePayload-test.js b\/src\/renderers\/native\/ReactNative\/__tests__\/ReactNativeAttributePayload-test.js\nindex be65d175a2..85d4283d13 100644\n--- a\/src\/renderers\/native\/ReactNative\/__tests__\/ReactNativeAttributePayload-test.js\n+++ b\/src\/renderers\/native\/ReactNative\/__tests__\/ReactNativeAttributePayload-test.js\n@@ -9,8 +9,8 @@\n  *\/\n 'use strict';\n \n-jest.dontMock('ReactNativeAttributePayload');\n-jest.dontMock('ReactNativePropRegistry');\n+jest.unmock('ReactNativeAttributePayload');\n+jest.unmock('ReactNativePropRegistry');\n \/\/ jest.dontMock('deepDiffer');\n \/\/ jest.dontMock('flattenStyle');\n \n@@ -62,8 +62,8 @@ describe('ReactNativeAttributePayload', function() {\n   });\n \n   it('should use the diff attribute', () => {\n-    var diffA = jest.genMockFunction().mockImpl((a, b) => true);\n-    var diffB = jest.genMockFunction().mockImpl((a, b) => false);\n+    var diffA = jest.fn((a, b) => true);\n+    var diffB = jest.fn((a, b) => false);\n     expect(diff(\n       {a: [1], b: [3]},\n       {a: [2], b: [4]},\n@@ -74,8 +74,8 @@ describe('ReactNativeAttributePayload', function() {\n   });\n \n   it('should not use the diff attribute on addition\/removal', () => {\n-    var diffA = jest.genMockFunction();\n-    var diffB = jest.genMockFunction();\n+    var diffA = jest.fn();\n+    var diffB = jest.fn();\n     expect(diff(\n       {a: [1]},\n       {b: [2]},\ndiff --git a\/src\/renderers\/shared\/event\/__tests__\/EventPluginHub-test.js b\/src\/renderers\/shared\/event\/__tests__\/EventPluginHub-test.js\nindex 5dc566c74b..b7d5843fc7 100644\n--- a\/src\/renderers\/shared\/event\/__tests__\/EventPluginHub-test.js\n+++ b\/src\/renderers\/shared\/event\/__tests__\/EventPluginHub-test.js\n@@ -12,7 +12,7 @@\n 'use strict';\n \n jest\n-  .dontMock('EventPluginHub')\n+  .unmock('EventPluginHub')\n   .mock('isEventSupported');\n \n describe('EventPluginHub', function() {\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js\nindex 444bedddb8..370931595d 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js\n@@ -255,7 +255,7 @@ describe('ReactComponent', function() {\n   });\n \n   it('fires the callback after a component is rendered', function() {\n-    var callback = jest.genMockFn();\n+    var callback = jest.fn();\n     var container = document.createElement('div');\n     ReactDOM.render(<div \/>, container, callback);\n     expect(callback.mock.calls.length).toBe(1);\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentNestedState-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentNestedState-test.js\nindex d574d57b9a..353892ee98 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentNestedState-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentNestedState-test.js\n@@ -90,7 +90,7 @@ describe('ReactCompositeComponentNestedState-state', function() {\n     var container = document.createElement('div');\n     document.body.appendChild(container);\n \n-    var logger = jest.genMockFn();\n+    var logger = jest.fn();\n \n     void ReactDOM.render(\n       <ParentComponent logger={logger} \/>,\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentState-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentState-test.js\nindex 49045338dc..f043381a5c 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentState-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentState-test.js\n@@ -130,7 +130,7 @@ describe('ReactCompositeComponent-state', function() {\n     var container = document.createElement('div');\n     document.body.appendChild(container);\n \n-    var stateListener = jest.genMockFn();\n+    var stateListener = jest.fn();\n     var instance = ReactDOM.render(\n       <TestComponent stateListener={stateListener} \/>,\n       container,\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChild-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChild-test.js\nindex 979b2115ad..079eec06d5 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChild-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChild-test.js\n@@ -26,9 +26,9 @@ describe('ReactMultiChild', function() {\n     it('should update children when possible', function() {\n       var container = document.createElement('div');\n \n-      var mockMount = jest.genMockFn();\n-      var mockUpdate = jest.genMockFn();\n-      var mockUnmount = jest.genMockFn();\n+      var mockMount = jest.fn();\n+      var mockUpdate = jest.fn();\n+      var mockUnmount = jest.fn();\n \n       var MockComponent = React.createClass({\n         componentDidMount: mockMount,\n@@ -59,8 +59,8 @@ describe('ReactMultiChild', function() {\n     it('should replace children with different constructors', function() {\n       var container = document.createElement('div');\n \n-      var mockMount = jest.genMockFn();\n-      var mockUnmount = jest.genMockFn();\n+      var mockMount = jest.fn();\n+      var mockUnmount = jest.fn();\n \n       var MockComponent = React.createClass({\n         componentDidMount: mockMount,\n@@ -87,8 +87,8 @@ describe('ReactMultiChild', function() {\n     it('should NOT replace children with different owners', function() {\n       var container = document.createElement('div');\n \n-      var mockMount = jest.genMockFn();\n-      var mockUnmount = jest.genMockFn();\n+      var mockMount = jest.fn();\n+      var mockUnmount = jest.fn();\n \n       var MockComponent = React.createClass({\n         componentDidMount: mockMount,\n@@ -124,8 +124,8 @@ describe('ReactMultiChild', function() {\n     it('should replace children with different keys', function() {\n       var container = document.createElement('div');\n \n-      var mockMount = jest.genMockFn();\n-      var mockUnmount = jest.genMockFn();\n+      var mockMount = jest.fn();\n+      var mockUnmount = jest.fn();\n \n       var MockComponent = React.createClass({\n         componentDidMount: mockMount,\ndiff --git a\/src\/shared\/utils\/__tests__\/accumulateInto-test.js b\/src\/shared\/utils\/__tests__\/accumulateInto-test.js\nindex 8dd9ee6f14..d12f572555 100644\n--- a\/src\/shared\/utils\/__tests__\/accumulateInto-test.js\n+++ b\/src\/shared\/utils\/__tests__\/accumulateInto-test.js\n@@ -12,7 +12,7 @@\n 'use strict';\n \n jest\n-  .dontMock('accumulateInto');\n+  .unmock('accumulateInto');\n \n var accumulateInto;\n \ndiff --git a\/src\/test\/__tests__\/ReactTestUtils-test.js b\/src\/test\/__tests__\/ReactTestUtils-test.js\nindex 9423381ca4..493e88e4bd 100644\n--- a\/src\/test\/__tests__\/ReactTestUtils-test.js\n+++ b\/src\/test\/__tests__\/ReactTestUtils-test.js\n@@ -89,7 +89,7 @@ describe('ReactTestUtils', function() {\n   });\n \n   it('should have shallow unmounting', function() {\n-    var componentWillUnmount = jest.genMockFn();\n+    var componentWillUnmount = jest.fn();\n \n     var SomeComponent = React.createClass({\n       render: function() {\n","body":"","parents":["b8f8360b5ceece894265f3e7015b6ed287603d03"],"commit":{"authorEmail":"christoph.pojer@gmail.com","shortRevision":"8e34514096","revision":"8e34514096e57aed1d6d0b2e9039459744807fb2","authoredAt":"2016-04-26T19:36:39+09:00","authorName":"cpojer","subject":"Update to Jest 12. Codemod to new Jest APIs."},"files":[{"status":"M","path":"grunt\/tasks\/jest.js"},{"status":"M","path":"package.json"},{"status":"M","path":"src\/core\/__tests__\/ReactErrorBoundaries-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/class\/__tests__\/ReactBind-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/class\/__tests__\/ReactClass-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/class\/__tests__\/ReactClassMixin-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/__tests__\/ReactBrowserEventEmitter-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/__tests__\/ReactEventListener-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/eventPlugins\/__tests__\/SelectEventPlugin-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/wrappers\/__tests__\/DisabledInputUtil-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMInput-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMTextarea-test.js"},{"status":"M","path":"src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/__tests__\/DOMPropertyOperations-test.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js"},{"status":"M","path":"src\/renderers\/native\/ReactNative\/__mocks__\/UIManager.js"},{"status":"M","path":"src\/renderers\/native\/ReactNative\/__tests__\/ReactNativeAttributePayload-test.js"},{"status":"M","path":"src\/renderers\/shared\/event\/__tests__\/EventPluginHub-test.js"},{"status":"M","path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js"},{"status":"M","path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentNestedState-test.js"},{"status":"M","path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponentState-test.js"},{"status":"M","path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChild-test.js"},{"status":"M","path":"src\/shared\/utils\/__tests__\/accumulateInto-test.js"},{"status":"M","path":"src\/test\/__tests__\/ReactTestUtils-test.js"}]}</article></body></html>

dillon1000/react

Files changed