Merge branch 'jest'

Author: tomconroy

bin/react-scripts.js

@@ -8,15 +8,15 @@ const args = process.argv.slice(3);
 switch (script) {
   case 'build':
   case 'start':
-  case 'test':
-  case 'test:watch':
+  case 'test': {
     const result = spawn.sync(
       'node',
       [require.resolve(path.join('../scripts', script))].concat(args),
       { stdio: 'inherit' }
     );
     process.exit(result.status);
     break;
+  }
   default:
     console.log(`Unknown script "${script}".`);
     break;

config/webpack.test.js

@@ -9,10 +9,7 @@ const httpProxy = require('http-proxy');
 const proxy = httpProxy.createProxyServer();
 
 module.exports = (graphqlOrigin) => (req, res) => {
-  console.log(req.body);
-
   proxy.web(req, res, { target: graphqlOrigin }, err => {
-    console.error(err);
-    // don't crash plz
+    console.error(err); // this prevents crash
   });
 };

lib/graphqlProxyMiddleware.js

@@ -1,6 +1,6 @@
 {
   "name": "react-scripts",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "shared react site configs",
   "main": "index.js",
   "author": "First Look Media",
@@ -12,6 +12,7 @@
     "autoprefixer": "^6.3.7",
     "babel": "^6.5.2",
     "babel-core": "^6.11.4",
+    "babel-jest": "^19.0.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-runtime": "^6.12.0",
     "babel-polyfill": "^6.9.1",
@@ -24,20 +25,21 @@
     "concat-stream": "^1.5.2",
     "cross-spawn": "^4.0.0",
     "css-loader": "^0.23.1",
+    "enzyme-to-json": "^1.5.1",
     "express": "^4.14.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
     "filesize": "^3.3.0",
     "fs-extra": "^2.0.0",
     "gzip-size": "^3.0.0",
     "http-proxy": "^1.14.0",
+    "identity-obj-proxy": "^3.0.0",
     "image-webpack-loader": "^2.0.0",
     "imports-loader": "^0.6.5",
+    "jest": "^19.0.2",
     "jsdom": "^9.4.1",
     "json-loader": "^0.5.4",
     "loader-utils": "^0.2.16",
-    "mocha": "^2.5.3",
-    "mocha-webpack": "^0.5.0",
     "postcss-calc": "^5.3.1",
     "postcss-loader": "^0.9.1",
     "precss": "^1.4.0",
@@ -52,32 +54,24 @@
     "webpack-node-externals": "^1.3.3"
   },
   "peerDependencies": {
-    "babel-runtime": "^6.11.6",
-    "chai": "^3.5.0",
-    "chai-enzyme": "^0.5.0",
-    "enzyme": "^2.4.1",
-    "react": "^15.3.0",
-    "react-addons-test-utils": "^15.3.0",
-    "react-dom": "^15.3.0",
-    "react-relay": "^0.9.0",
-    "sinon": "^1.17.5",
-    "sinon-chai": "^2.8.0",
-    "source-map-support": "^0.4.2"
+    "babel-runtime": ">=6.11.6",
+    "enzyme": ">=2.7.1",
+    "react": ">=15.3.0",
+    "react-addons-test-utils": ">=15.3.0",
+    "react-dom": ">=15.3.0",
+    "react-relay": ">=0.9.0",
+    "source-map-support": ">=0.4.2"
   },
   "devDependencies": {
-    "babel-relay-plugin": "^0.9.3",
-    "chai": "^3.5.0",
-    "chai-enzyme": "^0.5.2",
+    "babel-relay-plugin": ">=0.9.3",
     "core-js": "^2.4.1",
-    "enzyme": "^2.5.1",
+    "enzyme": "^2.7.1",
     "eslint": "^3.2.2",
     "eslint-config-airbnb-base": "^5.0.1",
     "eslint-plugin-import": "^1.12.0",
     "react": "^15.3.2",
     "react-addons-test-utils": "^15.3.2",
     "react-dom": "^15.3.2",
-    "sinon": "^1.17.6",
-    "sinon-chai": "^2.8.0",
     "source-map-support": "^0.4.6"
   }
 }

lib/mockRelay.js

@@ -1,25 +1,18 @@
-const spawn = require('cross-spawn');
-const path = require('path');
+const jest = require('jest');
+
+const argv = process.argv.slice(2);
 
-const testConfig = path.resolve(__dirname, '../config/webpack.test.js');
-const mochaWebpack = path.resolve(__dirname, '../node_modules/.bin/mocha-webpack');
-const setup = path.resolve(__dirname, '../lib/testSetup.js');
+// Watch unless on CI or in coverage mode
+if (!process.env.CI && argv.indexOf('--coverage') < 0) {
+  argv.push('--watch');
+}
 
-console.log('Running tests...');
+const createJestConfig = require('./utils/createJestConfig');
+const path = require('path');
 
-const child = spawn(
-  'node',
-  [
-    mochaWebpack,
-    '--colors',
-    '--exit',
-    '--webpack-config', testConfig,
-    '--require', setup,
-    'src/**/__spec.js',
-  ],
-  { stdio: 'inherit' }
+argv.push(
+  '--config',
+  JSON.stringify(createJestConfig())
 );
 
-child.on('close', code => process.exit(code));
-child.on('exit', code => process.exit(code));
-child.on('disconnect', code => process.exit(1));
+jest.run(argv);

lib/testSetup.js

@@ -0,0 +1 @@
+module.exports = 'test-file-stub';

package.json

@@ -0,0 +1,9 @@
+const Relay = require('react-relay');
+
+module.exports = {
+  QL: Relay.QL,
+  Mutation: Relay.Mutation,
+  Route: Relay.Route,
+  RootContainer: () => null,
+  createContainer: (component) => component,
+};