Replace jest.genMockFunction and related with jest.fn

Summary:Via Pro-Tip from kassens. Depends on D3161900. Reviewed By: josephsavona Differential Revision: D3162968 fb-gh-sync-id: 3702154abdb729d0cfef4416c7bac68f079f32b6 fbshipit-source-id: 3702154abdb729d0cfef4416c7bac68f079f32b6
facebook · Apr 12, 2016 · 8547af9 · 8547af9
1 parent 9c7fabc
commit 8547af9
Show file tree

Hide file tree

Showing 61 changed files with 180 additions and 180 deletions.
diff --git a/src/container/__mocks__/getRelayQueries.js b/src/container/__mocks__/getRelayQueries.js
@@ -11,4 +11,4 @@
 
 const getRelayQueries = require.requireActual('getRelayQueries');
 
-module.exports = jest.genMockFunction().mockImplementation(getRelayQueries);
+module.exports = jest.fn(getRelayQueries);
diff --git a/src/container/__tests__/RelayContainer-test.js b/src/container/__tests__/RelayContainer-test.js
@@ -44,18 +44,18 @@ describe('RelayContainer', function() {
   beforeEach(function() {
     jest.resetModuleRegistry();
 
-    const render = jest.genMockFunction().mockImplementation(function() {
+    const render = jest.fn(function() {
       // Make it easier to expect prop values.
       render.mock.calls[render.mock.calls.length - 1].props = this.props;
       return <div />;
     });
     MockComponent = React.createClass({render});
     MockContainer = Relay.createContainer(MockComponent, {
       fragments: {
-        foo: jest.genMockFunction().mockImplementation(
+        foo: jest.fn(
           () => Relay.QL`fragment on Node{id,name}`
         ),
-        bar: jest.genMockFunction().mockImplementation(
+        bar: jest.fn(
           () => Relay.QL`fragment on Node @relay(plural:true){id,name}`
         ),
       },
@@ -844,14 +844,14 @@ describe('RelayContainer', function() {
       '43': {__dataID__: '43', name: 'Tee'},
       '44': {__dataID__: '44', name: 'Toe'},
     };
-    const render = jest.genMockFunction().mockImplementation(() => <div />);
-    const shouldComponentUpdate = jest.genMockFunction();
+    const render = jest.fn(() => <div />);
+    const shouldComponentUpdate = jest.fn();
 
     const MockFastComponent = React.createClass({render, shouldComponentUpdate});
 
     const MockFastContainer = Relay.createContainer(MockFastComponent, {
       fragments: {
-        foo: jest.genMockFunction().mockImplementation(
+        foo: jest.fn(
           () => Relay.QL`fragment on Node{id,name}`
         ),
       },

diff --git a/src/container/__tests__/RelayContainer_Component-test.js b/src/container/__tests__/RelayContainer_Component-test.js
@@ -30,14 +30,14 @@ describe('RelayContainer', function() {
     jest.resetModuleRegistry();
 
     MockComponent = React.createClass({
-      render: jest.genMockFunction().mockImplementation(() => <div />),
+      render: jest.fn(() => <div />),
     });
 
     mockCreateContainer = component => {
       MockContainer = Relay.createContainer(component, {
         initialVariables: {site: 'mobile'},
         fragments: {
-          foo: jest.genMockFunction().mockImplementation(
+          foo: jest.fn(
             () => Relay.QL`fragment on Node{id,url(site:$site)}`
           ),
         },

diff --git a/src/container/__tests__/RelayContainer_setVariables-test.js b/src/container/__tests__/RelayContainer_setVariables-test.js
@@ -40,8 +40,8 @@ describe('RelayContainer.setVariables', function() {
     jest.resetModuleRegistry();
 
     const fragment = Relay.QL`fragment on Node{url(site:$site)}`;
-    entityQuery = jest.genMockFunction().mockImplementation(() => fragment);
-    render = jest.genMockFunction().mockImplementation(() => <div />);
+    entityQuery = jest.fn(() => fragment);
+    render = jest.fn(() => <div />);
 
     // Make RQLTransform ignore this call.
     MockComponent = React.createClass({render});
@@ -98,7 +98,7 @@ describe('RelayContainer.setVariables', function() {
           },
         }];
       });
-      const pluralEntityQuery = jest.genMockFunction().mockImplementation(
+      const pluralEntityQuery = jest.fn(
         () => Relay.QL`
           fragment on Node @relay(plural:true) {
             url(site: $site)
@@ -254,7 +254,7 @@ describe('RelayContainer.setVariables', function() {
     });
 
     it('updates `variables` after callback when data is ready', () => {
-      const mockCallback = jest.genMockFunction();
+      const mockCallback = jest.fn();
       mockInstance.setVariables({site: 'www'}, mockCallback);
       jest.runAllTimers();
 
@@ -297,7 +297,7 @@ describe('RelayContainer.setVariables', function() {
 
       environment.primeCache.mock.requests[0].block();
 
-      const mockCallback = jest.genMockFunction();
+      const mockCallback = jest.fn();
       mockInstance.setVariables({site: 'mobile'}, mockCallback);
       jest.runAllTimers();
 
@@ -349,7 +349,7 @@ describe('RelayContainer.setVariables', function() {
     });
 
     it('invokes the callback as many times as ready state changes', () => {
-      const mockFunction = jest.genMockFunction().mockImplementation(function() {
+      const mockFunction = jest.fn(function() {
         expect(this.constructor).toBe(MockComponent);
       });
       mockInstance.setVariables({site: 'www'}, mockFunction);
@@ -366,7 +366,7 @@ describe('RelayContainer.setVariables', function() {
     });
 
     it('invokes the callback with the component as `this`', () => {
-      const mockFunction = jest.genMockFunction().mockImplementation(function() {
+      const mockFunction = jest.fn(function() {
         expect(this.constructor).toBe(MockComponent);
       });
       mockInstance.setVariables({site: 'www'}, mockFunction);
@@ -406,11 +406,11 @@ describe('RelayContainer.setVariables', function() {
     let prepareVariables;
 
     beforeEach(() => {
-      entityQuery = jest.genMockFunction().mockImplementation(
+      entityQuery = jest.fn(
         () => Relay.QL`fragment on Node{url(site:$site)}`
       );
-      render = jest.genMockFunction().mockImplementation(() => <div />);
-      prepareVariables = jest.genMockFunction().mockImplementation(
+      render = jest.fn(() => <div />);
+      prepareVariables = jest.fn(
         (variables, route) => variables
       );
 
@@ -467,7 +467,7 @@ describe('RelayContainer.setVariables', function() {
     });
 
     it('ignores `setState` from callback when request aborts', () => {
-      const mockCallback = jest.genMockFunction()
+      const mockCallback = jest.fn()
         .mockImplementation(readyState => {
           if (readyState.mounted) {
             this.setState({isAborted: true});

diff --git a/src/container/__tests__/RelayRenderer_onReadyStateChange-test.js b/src/container/__tests__/RelayRenderer_onReadyStateChange-test.js
@@ -45,7 +45,7 @@ describe('RelayRenderer.onReadyStateChange', () => {
   let onReadyStateChange;
 
   beforeEach(() => {
-    onReadyStateChange = jest.genMockFunction();
+    onReadyStateChange = jest.fn();
     ReactDOM.render(
       <RelayRenderer
         Container={MockContainer}

diff --git a/src/container/__tests__/RelayRenderer_render-test.js b/src/container/__tests__/RelayRenderer_render-test.js
@@ -79,7 +79,7 @@ describe('RelayRenderer.render', () => {
 
   it('renders when mounted before a request is sent', () => {
     const initialView = <div />;
-    const render = jest.genMockFunction().mockReturnValue(initialView);
+    const render = jest.fn(() => initialView);
     renderElement(
       <RelayRenderer
         Container={MockContainer}
@@ -140,7 +140,7 @@ describe('RelayRenderer.render', () => {
   });
 
   it('renders whenever updated after request is sent', () => {
-    const render = jest.genMockFunction();
+    const render = jest.fn();
     function update() {
       renderElement(
         <RelayRenderer
@@ -164,7 +164,7 @@ describe('RelayRenderer.render', () => {
   });
 
   it('renders once after each ready state change', () => {
-    const render = jest.genMockFunction();
+    const render = jest.fn();
 
     renderElement(
       <RelayRenderer
@@ -194,12 +194,12 @@ describe('RelayRenderer.render', () => {
 
     beforeEach(() => {
       const storeData = environment.getStoreData();
-      storeData.initializeGarbageCollector(jest.genMockFunction());
+      storeData.initializeGarbageCollector(jest.fn());
       garbageCollector = storeData.getGarbageCollector();
     });
 
     it('acquires a GC hold when mounted', () => {
-      garbageCollector.acquireHold = jest.genMockFunction();
+      garbageCollector.acquireHold = jest.fn();
       renderElement(
         <RelayRenderer
           Container={MockContainer}
@@ -211,9 +211,9 @@ describe('RelayRenderer.render', () => {
     });
 
     it('releases its GC hold when unmounted', () => {
-      const release = jest.genMockFunction();
+      const release = jest.fn();
       garbageCollector.acquireHold =
-        jest.genMockFunction().mockReturnValue({release});
+        jest.fn(() => ({release}));
       renderElement(
         <RelayRenderer
           Container={MockContainer}

diff --git a/src/container/__tests__/RelayRenderer_renderArgs-test.js b/src/container/__tests__/RelayRenderer_renderArgs-test.js
@@ -42,7 +42,7 @@ describe('RelayRenderer.renderArgs', () => {
     queryConfig = RelayQueryConfig.genMockInstance();
     environment = new RelayEnvironment();
 
-    render = jest.genMockFunction();
+    render = jest.fn();
     ReactDOM.render(
       <RelayRenderer
         Container={MockContainer}

diff --git a/src/container/__tests__/RelayRenderer_requests-test.js b/src/container/__tests__/RelayRenderer_requests-test.js
@@ -155,8 +155,8 @@ describe('RelayRenderer', function() {
   });
 
   it('calls `onForceFetch` hook if supplied', () => {
-    const onForceFetch = jest.genMockFunction();
-    const onPrimeCache = jest.genMockFunction();
+    const onForceFetch = jest.fn();
+    const onPrimeCache = jest.fn();
 
     ReactDOM.render(
       <RelayRenderer
@@ -175,8 +175,8 @@ describe('RelayRenderer', function() {
 
   it('calls `onPrimeCache` hook if supplied', () => {
     const anotherQueryConfig = RelayQueryConfig.genMockInstance();
-    const onForceFetch = jest.genMockFunction();
-    const onPrimeCache = jest.genMockFunction();
+    const onForceFetch = jest.fn();
+    const onPrimeCache = jest.fn();
 
     ReactDOM.render(
       <RelayRenderer

diff --git a/src/container/__tests__/RelayRenderer_validation-test.js b/src/container/__tests__/RelayRenderer_validation-test.js
@@ -45,7 +45,7 @@ describe('RelayRenderer.validation', () => {
     queryConfig = RelayQueryConfig.genMockInstance();
     environment = new RelayEnvironment();
 
-    console.error = jest.genMockFunction().mockImplementation(message => {
+    console.error = jest.fn(message => {
       throw new Error(message.replace(/Composite propType/, 'propType'));
     });
   });

diff --git a/src/legacy/store/__mocks__/GraphQLQueryRunner.js b/src/legacy/store/__mocks__/GraphQLQueryRunner.js
@@ -55,7 +55,7 @@ GraphQLQueryRunner.mockImplementation(function() {
   this.run.mockImplementation((...args) => {
     const request = genMockRequest(args);
     const returnValue = {
-      abort: jest.genMockFunction().mockImplementation(() => {
+      abort: jest.fn(() => {
         resolveImmediate(request.abort);
       }),
     };
@@ -69,7 +69,7 @@ GraphQLQueryRunner.mockImplementation(function() {
   this.forceFetch.mockImplementation((...args) => {
     const request = genMockRequest(args);
     const returnValue = {
-      abort: jest.genMockFunction().mockImplementation(() => {
+      abort: jest.fn(() => {
         resolveImmediate(request.abort);
       }),
     };

diff --git a/src/legacy/store/__mocks__/GraphQLStoreChangeEmitter.js b/src/legacy/store/__mocks__/GraphQLStoreChangeEmitter.js
@@ -14,7 +14,7 @@ const GraphQLStoreChangeEmitter = jest.genMockFromModule('GraphQLStoreChangeEmit
 GraphQLStoreChangeEmitter.mockImplementation(function() {
   this.addListenerForIDs.mock.remove = [];
   this.addListenerForIDs.mockImplementation(() => {
-    const returnValue = {remove: jest.genMockFunction()};
+    const returnValue = {remove: jest.fn()};
     this.addListenerForIDs.mock.remove.push(
       returnValue.remove
     );

diff --git a/src/legacy/store/__mocks__/GraphQLStoreQueryResolver.js b/src/legacy/store/__mocks__/GraphQLStoreQueryResolver.js
@@ -19,15 +19,15 @@ class GraphQLStoreQueryResolver {
       queryFragment,
       store,
     };
-    this.resolve = jest.genMockFunction().mockImplementation((...args) => {
+    this.resolve = jest.fn((...args) => {
       const mockConstructor = GraphQLStoreQueryResolver.mock;
       const mockResolve =
         mockConstructor.resolveImplementations[this.mock.index] ||
         mockConstructor.defaultResolveImplementation;
       return mockResolve.apply(this, args);
     });
-    this.reset = jest.genMockFunction();
-    this.dispose = jest.genMockFunction();
+    this.reset = jest.fn();
+    this.dispose = jest.fn();
     mockInstances.push(this);
   }
 

diff --git a/src/legacy/store/__mocks__/GraphQLStoreRangeUtils.js b/src/legacy/store/__mocks__/GraphQLStoreRangeUtils.js
@@ -16,7 +16,7 @@ Object.getOwnPropertyNames(GraphQLStoreRangeUtils.prototype).forEach(name => {
   const property = GraphQLStoreRangeUtils.prototype[name];
   if (typeof property === 'function') {
     GraphQLStoreRangeUtils.prototype[name] =
-      jest.genMockFunction().mockImplementation(property);
+      jest.fn(property);
   }
 });
 

diff --git a/src/legacy/store/__mocks__/GraphQLStoreTestUtils.js b/src/legacy/store/__mocks__/GraphQLStoreTestUtils.js
@@ -46,7 +46,7 @@ const GraphQLStoreTestUtils = {
     /* globals expect: false */
     const consoleFunction = console[type];
     const whitelistedStrings = [];
-    const mockFunction = jest.genMockFunction().mockImplementation(
+    const mockFunction = jest.fn(
       function(...args) {
         const formatString = args[0];
         if (whitelistedStrings.indexOf(formatString) >= 0) {

diff --git a/src/legacy/store/__mocks__/generateClientID.js b/src/legacy/store/__mocks__/generateClientID.js
@@ -11,7 +11,7 @@
 
 let count = 1;
 
-const generateClientID = jest.genMockFunction().mockImplementation(
+const generateClientID = jest.fn(
   () => { return 'client:' + count++; }
 );
 

diff --git a/src/legacy/store/__tests__/GraphQLQueryRunner-test.js b/src/legacy/store/__tests__/GraphQLQueryRunner-test.js
@@ -71,7 +71,7 @@ describe('GraphQLQueryRunner', () => {
       supports: () => true,
     });
 
-    mockCallback = jest.genMockFunction();
+    mockCallback = jest.fn();
     mockQuerySet = {
       foo: getNode(Relay.QL`query{viewer{actor{id,name}}}`),
       bar: getNode(Relay.QL`query{node(id:"4"){id,name}}`),
@@ -307,9 +307,9 @@ describe('GraphQLQueryRunner', () => {
   it('is ready if required data is in disk cache', () => {
     diffRelayQuery.mockImplementation(query => [query]);
     RelayStoreData.prototype.hasCacheManager =
-      jest.genMockFunction().mockImplementation(() => true);
+      jest.fn(() => true);
     RelayStoreData.prototype.readFromDiskCache =
-      jest.genMockFunction().mockImplementation((queries, callback) => {
+      jest.fn((queries, callback) => {
         callback.onSuccess();
       });
     mockSplitDeferredQueries();