Upgrade to jest v15

See https://facebook.github.io/jest/blog/2016/09/01/jest-15.html for
details what changed.

I only did some minimal cleanup to make all tests pass.

Author: fkling

bin/__tests__/react-docgen-test.js

@@ -8,14 +8,15 @@
  *
  */
 
-/*global jasmine, jest, describe, it, expect, afterEach*/
+/*global jasmine, describe, it, expect, afterEach*/
+
+// NOTE: This test spawns a subprocesses that load the files from dist/, not
+// src/. Before running this test run `npm run build` or `npm run watch`.
 
 const TEST_TIMEOUT = 120000;
 
 jasmine.DEFAULT_TIMEOUT_INTERVAL = TEST_TIMEOUT;
 
-jest.disableAutomock();
-
 var fs = require('fs');
 var path = require('path');
 var rimraf = require('rimraf');
@@ -96,8 +97,8 @@ describe('react-docgen CLI', () => {
 
   it('reads from stdin', () => {
     return run([], component).then(([stdout, stderr]) => {
-      expect(stdout.length > 0).toBe(true);
-      expect(stderr.length).toBe(0);
+      expect(stdout).not.toBe('');
+      expect(stderr).toBe('');
     });
   }, TEST_TIMEOUT);
 
@@ -238,7 +239,6 @@ describe('react-docgen CLI', () => {
           '--resolver='+path.join(__dirname, './example/customResolver.js'),
           path.join(__dirname, '../../example/components/Component.js'),
         ]).then(([stdout, stderr]) => {
-          console.log(stderr);
           expect(stdout).toContain('Custom');
         }),
       ]);

package.json

@@ -39,7 +39,7 @@
   "devDependencies": {
     "babel-cli": "^6.9.0",
     "babel-eslint": "^6.0.4",
-    "babel-jest": "^14.1.0",
+    "babel-jest": "^15.0.0",
     "babel-plugin-syntax-flow": "^6.8.0",
     "babel-plugin-transform-flow-strip-types": "^6.8.0",
     "babel-plugin-transform-runtime": "^6.9.0",
@@ -48,7 +48,7 @@
     "cross-spawn": "^4.0.0",
     "eslint": "^3.2.2",
     "flow-bin": "^0.31.0",
-    "jest-cli": "^14.1.0",
+    "jest-cli": "^15.1.1",
     "rimraf": "^2.3.2",
     "temp": "^0.8.1"
   },
@@ -60,13 +60,6 @@
     ],
     "testPathIgnorePatterns": [
       "/bin/__tests__/example/"
-    ],
-    "unmockedModulePathPatterns": [
-      "node_modules",
-      "tests/utils",
-      "recast",
-      "babel",
-      "babylon"
     ]
   }
 }

src/handlers/__tests__/componentMethodsJsDocHandler-test.js

@@ -8,17 +8,16 @@
  *
  */
 
-/*global jest, describe, beforeEach, it, expect*/
+/*global describe, beforeEach, it, expect*/
 
-jest.disableAutomock();
+import Documentation from '../../Documentation';
+import componentMethodsJsDocHandler from '../componentMethodsJsDocHandler';
 
 describe('componentMethodsHandler', () => {
   let documentation;
-  let componentMethodsJsDocHandler;
 
   beforeEach(() => {
-    documentation = new (require('../../Documentation'));
-    componentMethodsJsDocHandler = require('../componentMethodsJsDocHandler').default;
+    documentation = new Documentation();
   });
 
   it('stays the same when no docblock is present', () => {

src/handlers/__tests__/propTypeHandler-test.js

@@ -10,23 +10,20 @@
 
 /*global jest, describe, it, expect, beforeEach*/
 
-jest.disableAutomock();
 jest.mock('../../Documentation');
+jest.mock('../../utils/getPropType', () => jest.fn(() => ({})));
+
+import {statement, expression} from '../../../tests/utils';
+import Documentation from '../../Documentation';
+import propTypeHandler from '../propTypeHandler';
 
 describe('propTypeHandler', () => {
-  var statement, expression;
   var getPropTypeMock;
   var documentation;
-  var propTypeHandler;
 
   beforeEach(() => {
-    ({statement, expression} = require('../../../tests/utils'));
-    getPropTypeMock = jest.genMockFunction().mockImplementation(() => ({}));
-    jest.setMock('../../utils/getPropType', getPropTypeMock);
-    jest.mock('../../utils/getPropType');
-
-    documentation = new (require('../../Documentation'));
-    propTypeHandler = require('../propTypeHandler').default;
+    getPropTypeMock = require('../../utils/getPropType');
+    documentation = new Documentation();
   });
 
   function template(src) {

src/resolver/__tests__/findAllComponentDefinitions-test.js

@@ -8,28 +8,21 @@
  *
  */
 
-/*global jest, describe, beforeEach, it, expect*/
+/*global describe, it, expect*/
 
-jest.disableAutomock();
+import recast from 'recast';
+import * as utils from '../../../tests/utils';
+import findAllComponentDefinitions from '../findAllComponentDefinitions';
 
 describe('findAllComponentDefinitions', () => {
-  var findAllComponentDefinitions;
-  var recast;
-  var utils;
 
   function parse(source) {
     return findAllComponentDefinitions(
-      utils.parse(source),
+      utils.parse(source, recast),
       recast
     );
   }
 
-  beforeEach(() => {
-    findAllComponentDefinitions = require('../findAllComponentDefinitions').default;
-    utils = require('../../../tests/utils');
-    recast = require('recast');
-  });
-
   describe('React.createClass', () => {
 
     it('finds React.createClass', () => {

src/resolver/__tests__/findAllExportedComponentDefinitions-test.js

@@ -8,15 +8,13 @@
  *
  */
 
-/*global jest, describe, beforeEach, it, expect*/
+/*global describe, it, expect*/
+import recast from 'recast';
+import * as utils from '../../../tests/utils';
 
-jest.disableAutomock();
+import findAllExportedComponentDefinitions from '../findAllExportedComponentDefinitions';
 
 describe('findAllExportedComponentDefinitions', () => {
-  var findAllExportedComponentDefinitions;
-  var utils;
-  var recast;
-
   function parse(source) {
     return utils.parse(source);
   }
@@ -25,13 +23,6 @@ describe('findAllExportedComponentDefinitions', () => {
     return findAllExportedComponentDefinitions(path, recast);
   }
 
-  beforeEach(() => {
-    findAllExportedComponentDefinitions =
-      require('../findAllExportedComponentDefinitions').default;
-    utils = require('../../../tests/utils');
-    recast = require('recast');
-  });
-
   describe('CommonJS module exports', () => {
 
     describe('React.createClass', () => {

src/resolver/__tests__/findExportedComponentDefinition-test.js

@@ -8,29 +8,20 @@
  *
  */
 
-/*global jest, describe, beforeEach, it, expect*/
+/*global describe, it, expect*/
 
-jest.disableAutomock();
+import recast from 'recast';
+import * as utils from '../../../tests/utils';
+import findExportedComponentDefinition from '../findExportedComponentDefinition';
 
 describe('findExportedComponentDefinition', () => {
-  var findExportedComponentDefinition;
-  var utils;
-  var recast;
-
   function parse(source) {
     return findExportedComponentDefinition(
       utils.parse(source),
       recast
     );
   }
 
-  beforeEach(() => {
-    findExportedComponentDefinition =
-      require('../findExportedComponentDefinition').default;
-    utils = require('../../../tests/utils');
-    recast = require('recast');
-  });
-
   describe('CommonJS module exports', () => {
 
     describe('React.createClass', () => {

src/utils/__tests__/docblock-test.js

@@ -8,20 +8,17 @@
  *
  */
 
-/*global jest, describe, beforeEach, it, expect*/
-var os = require('os');
-var EOL = os.EOL;
+/*global describe, it, expect*/
+import os from 'os';
+import {statement} from '../../../tests/utils';
 
-jest.unmock('../docblock');
+import {getDoclets, getDocblock} from '../docblock';
+
+const EOL = os.EOL;
 
 describe('docblock', () => {
 
   describe('getDoclets', () => {
-    let getDoclets;
-
-    beforeEach(() => {
-      ({getDoclets} = require('../docblock'));
-    });
 
     it('extracts single line doclets', () => {
       expect(getDoclets('@foo bar\n@bar baz'))
@@ -37,6 +34,7 @@ describe('docblock', () => {
       expect(getDoclets('@foo bar\nbaz\n@abc\n@bar baz'))
         .toEqual({foo: 'bar\nbaz', abc: true, bar: 'baz'});
     });
+
   });
 
   describe('getDocblock', () => {
@@ -49,14 +47,6 @@ describe('docblock', () => {
       'foo;',
     ];
 
-    let getDocblock;
-    let statement;
-
-    beforeEach(() => {
-      ({getDocblock} = require('../docblock'));
-      ({statement} = require('../../../tests/utils'));
-    });
-
     it('gets the closest docblock of the given node', () => {
       let node = statement(source.join(EOL));
       expect(getDocblock(node)).toEqual(comment.join(EOL));

src/utils/__tests__/getMemberExpressionRoot-test.js

@@ -8,17 +8,17 @@
  *
  */
 
-/*global jest, describe, it, expect*/
+/*global describe, it, expect*/
 
 import {expression} from '../../../tests/utils';
 
-jest.unmock('../getMemberExpressionRoot');
-
-var getMemberExpressionRoot = require('../getMemberExpressionRoot').default;
+import getMemberExpressionRoot from '../getMemberExpressionRoot';
 
 describe('getMemberExpressionRoot', () => {
+
   it('returns the root of a member expression', () => {
     var root = getMemberExpressionRoot(expression('foo.bar.baz'));
     expect(root.node).toEqualASTNode(expression('foo').node);
   });
+
 });

src/utils/__tests__/getMemberValuePath-test.js

@@ -8,46 +8,41 @@
  *
  */
 
-/*global jest, describe, beforeEach, it, expect*/
+/*global jest, describe, it, expect*/
 
-jest.unmock('../getMemberValuePath');
+jest.mock('../getPropertyValuePath');
+jest.mock('../getClassMemberValuePath');
 
-describe('getMemberValuePath', () => {
-  var getMemberValuePath;
-  var expression, statement;
+import {expression, statement} from '../../../tests/utils';
 
-  beforeEach(() => {
-    ({expression, statement} = require('../../../tests/utils'));
-    getMemberValuePath = require('../getMemberValuePath').default;
-  });
+import getPropertyValuePath from '../getPropertyValuePath';
+import getClassMemberValuePath from '../getClassMemberValuePath';
+import getMemberValuePath from '../getMemberValuePath';
+
+describe('getMemberValuePath', () => {
 
   it('handles ObjectExpresisons', () => {
-    var getPropertyValuePath = require('../getPropertyValuePath').default;
     var path = expression('{}');
 
     getMemberValuePath(path, 'foo');
     expect(getPropertyValuePath).toBeCalledWith(path, 'foo');
   });
 
   it('handles ClassDeclarations', () => {
-    var getClassMemberValuePath = require('../getClassMemberValuePath').default;
     var path = statement('class Foo {}');
 
     getMemberValuePath(path, 'foo');
     expect(getClassMemberValuePath).toBeCalledWith(path, 'foo');
   });
 
   it('handles ClassExpressions', () => {
-    var getClassMemberValuePath = require('../getClassMemberValuePath').default;
     var path = expression('class {}');
 
     getMemberValuePath(path, 'foo');
     expect(getClassMemberValuePath).toBeCalledWith(path, 'foo');
   });
 
   it('tries synonyms', () => {
-    var getPropertyValuePath = require('../getPropertyValuePath').default;
-    var getClassMemberValuePath = require('../getClassMemberValuePath').default;
     var path = expression('{}');
 
     getMemberValuePath(path, 'defaultProps');
@@ -62,8 +57,6 @@ describe('getMemberValuePath', () => {
   });
 
   it('returns the result of getPropertyValuePath and getClassMemberValuePath', () => {
-    var getPropertyValuePath = require('../getPropertyValuePath').default;
-    var getClassMemberValuePath = require('../getClassMemberValuePath').default;
     getPropertyValuePath.mockReturnValue(42);
     getClassMemberValuePath.mockReturnValue(21);
     var path = expression('{}');
@@ -74,4 +67,5 @@ describe('getMemberValuePath', () => {
 
     expect(getMemberValuePath(path, 'defaultProps')).toBe(21);
   });
+
 });