Added jest-runtime CLI

packages/jest-cli/src/SearchSource.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {HasteResolverContext} from './types';
+import type {HasteResolverContext} from '../../jest-runtime/src/types';
 import type {Path} from 'types/Config';
 import type {ResolveModuleConfig} from '../../jest-resolve/src';
 

packages/jest-cli/src/Test.js

@@ -12,8 +12,8 @@
 import type {Path, Config} from 'types/Config';
 import type Resolver from '../../jest-resolve/src';
 
-const Console = require('./Console');
-const NullConsole = require('./NullConsole');
+const Console = require('jest-util').Console;
+const NullConsole = require('jest-util').NullConsole;
 
 class Test {
 

packages/jest-cli/src/TestRunner.js

@@ -15,7 +15,7 @@ import type {
   TestResult,
 } from 'types/TestResult';
 import type {Config, Path} from 'types/Config';
-import type {HasteResolverContext} from './types';
+import type {HasteResolverContext} from '../../jest-runtime/src/types';
 
 const Test = require('./Test');
 

packages/jest-cli/src/__tests__/SearchSource-test.js

@@ -21,13 +21,13 @@ let normalizeConfig;
 
 describe('SearchSource', () => {
   const name = 'SearchSource';
-  let buildHasteMap;
+  let Runtime;
   let hasteMap;
   let SearchSource;
   let searchSource;
 
   beforeEach(() => {
-    buildHasteMap = require('../lib/buildHasteMap');
+    Runtime = require('jest-runtime');
     SearchSource = require('../SearchSource');
     normalizeConfig = require('jest-config').normalize;
   });
@@ -41,7 +41,7 @@ describe('SearchSource', () => {
         rootDir: '.',
         testPathDirs: [],
       });
-      hasteMap = buildHasteMap(config, {maxWorkers});
+      hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       searchSource = new SearchSource(hasteMap, config);
     });
 
@@ -75,7 +75,7 @@ describe('SearchSource', () => {
         moduleFileExtensions: ['js', 'jsx', 'txt'],
         testRegex: 'not-really-a-test',
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -94,7 +94,7 @@ describe('SearchSource', () => {
         moduleFileExtensions: ['js', 'jsx'],
         testRegex: 'test\.jsx?',
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -113,7 +113,7 @@ describe('SearchSource', () => {
         rootDir,
         testRegex,
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -132,7 +132,7 @@ describe('SearchSource', () => {
         testRegex,
         moduleFileExtensions: ['jsx'],
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -151,7 +151,7 @@ describe('SearchSource', () => {
         testRegex,
         moduleFileExtensions: ['foobar'],
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -170,7 +170,7 @@ describe('SearchSource', () => {
         testRegex,
         moduleFileExtensions: ['js', 'jsx'],
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -189,7 +189,7 @@ describe('SearchSource', () => {
         rootDir,
         testDirectoryName: '__testtests__',
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -207,7 +207,7 @@ describe('SearchSource', () => {
         rootDir,
         testFileExtensions: ['js', 'jsx'],
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -228,7 +228,7 @@ describe('SearchSource', () => {
         testDirectoryName: '__testtests__',
         testFileExtensions: ['js', 'jsx', 'foobar'],
       });
-      const hasteMap = buildHasteMap(config, {maxWorkers});
+      const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       const searchSource = new SearchSource(hasteMap, config);
       return searchSource.findMatchingTests().then(data => {
         const relPaths = data.paths.map(absPath => (
@@ -261,7 +261,7 @@ describe('SearchSource', () => {
         name: 'SearchSource-findRelatedTests-tests',
         rootDir,
       });
-      hasteMap = buildHasteMap(config, {maxWorkers});
+      hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
       searchSource = new SearchSource(hasteMap, config);
     });
 

packages/jest-cli/src/cli/index.js

@@ -15,22 +15,7 @@ const fs = require('fs');
 const getJest = require('./getJest');
 const path = require('path');
 const yargs = require('yargs');
-
-function getPackageRoot() {
-  const cwd = process.cwd();
-
-  // Is the cwd somewhere within an npm package?
-  let root = cwd;
-  while (!fs.existsSync(path.join(root, 'package.json'))) {
-    if (root === '/' || root.match(/^[A-Z]:\\/)) {
-      root = cwd;
-      break;
-    }
-    root = path.resolve(root, '..');
-  }
-
-  return root;
-}
+const getPackageRoot = require('jest-util').getPackageRoot;
 
 function Run() {
   const argv = yargs

packages/jest-cli/src/jest.js

@@ -20,7 +20,7 @@ fs.gracefulify(realFs);
 const TestRunner = require('./TestRunner');
 const SearchSource = require('./SearchSource');
 
-const buildHasteMap = require('./lib/buildHasteMap');
+const Runtime = require('jest-runtime');
 const chalk = require('chalk');
 const constants = require('./constants');
 const formatTestResults = require('./lib/formatTestResults');
@@ -85,7 +85,7 @@ function getWatcher(config, packageRoot, callback) {
 function runJest(config, argv, pipe, onComplete) {
   const patternInfo = buildTestPathPatternInfo(argv);
   const maxWorkers = getMaxWorkers(argv);
-  const hasteMap = buildHasteMap(config, {maxWorkers});
+  const hasteMap = Runtime.buildHasteMap(config, {maxWorkers});
   const source = new SearchSource(hasteMap, config);
   return source.getTestPaths(patternInfo)
     .then(data => {
@@ -196,7 +196,6 @@ function runCLI(argv: Object, root: Path, onComplete: () => void) {
 }
 
 module.exports = {
-  buildHasteMap,
   getVersion: () => constants.VERSION,
   runCLI,
   SearchSource,

packages/jest-runtime/bin/jest-runtime.js

@@ -0,0 +1,16 @@
+#!/usr/bin/env node
+/**
+ * Copyright (c) 2014, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+if (process.env.NODE_ENV == null) {
+  process.env.NODE_ENV = 'test';
+}
+
+require('../build/cli').Run();

packages/jest-runtime/package.json

@@ -9,13 +9,18 @@
   "main": "build/index.js",
   "dependencies": {
     "graceful-fs": "^4.1.3",
+    "jest-config": "^12.1.0",
     "jest-environment-jsdom": "^12.1.0",
     "jest-haste-map": "^12.1.0",
     "jest-mock": "^12.1.0",
     "jest-resolve": "^12.1.0",
     "jest-snapshot": "^12.1.0",
     "jest-util": "^12.1.0",
-    "json-stable-stringify": "^1.0.0"
+    "json-stable-stringify": "^1.0.0",
+    "yargs": "^4.7.1"
+  },
+  "bin": {
+    "jest-runtime": "./bin/jest-runtime.js"
   },
   "devDependencies": {
     "jest-config": "^12.1.0"
@@ -25,7 +30,8 @@
     "testPathIgnorePatterns": [
       "/__tests__/[^/]*/.+"
     ],
-    "testEnvironment": "jest-environment-node"
+    "testEnvironment": "jest-environment-node",
+    "automock": false
   },
   "scripts": {
     "test": "../../packages/jest-cli/bin/jest.js"

packages/jest-runtime/src/__tests__/Runtime-cli-test.js

@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @emails oncall+jsinfra
+ */
+'use strict';
+
+const spawnSync = require('child_process').spawnSync;
+const path = require('path');
+
+const JEST_RUNTIME = path.resolve(__dirname, '../../bin/jest-runtime.js');
+
+jest.disableAutomock();
+
+describe('Runtime', () => {
+  describe('cli', () => {
+    it('fails with no path', () => {
+      const expectedOutput =
+        'Please provide a path to a script. (See --help for details)';
+      const output = spawnSync(JEST_RUNTIME, [], {
+        encoding : 'utf8',
+        cwd: process.cwd(),
+        env: process.env,
+      });
+      expect(output.stdout.trim()).toBe(expectedOutput);
+    });
+
+    it('displays script output', () => {
+      const scriptPath = path.resolve(__dirname, './test_root/logging.js');
+      const output = spawnSync(JEST_RUNTIME, [scriptPath], {
+        encoding : 'utf8',
+        cwd: process.cwd(),
+        env: process.env,
+      });
+      expect(output.stdout.trim()).toBe('Hello, world!');
+    });
+
+    it('throws script errors', () => {
+      const scriptPath = path.resolve(__dirname, './test_root/throwing.js');
+      const output = spawnSync(JEST_RUNTIME, [scriptPath], {
+        encoding : 'utf8',
+        cwd: process.cwd(),
+        env: process.env,
+      });
+      expect(output.stderr.trim()).toMatch('Error: throwing');
+    });
+  });
+});

packages/jest-runtime/src/__tests__/test_root/logging.js

@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+console.log('Hello, world!');