Merge pull request #220 from conveyal/dev

3.11.0
conveyal · Jun 12, 2017 · 51f9cb0 · 51f9cb0
2 parents da1c618 + 37fadec
commit 51f9cb0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/__tests__/lib/__snapshots__/jest.js.snap b/__tests__/lib/__snapshots__/jest.js.snap
@@ -1,14 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`test.js generateTestConfig should generate proper config 1`] = `
+exports[`jest.js generateTestConfig should generate proper config 1`] = `
 Array [
-  "--forceExit",
   "--updateSnapshot",
   "--no-cache",
   "--runInBand",
   "--config",
   Object {
-    "cacheDirectory": "tmp",
     "collectCoverageFrom": Array [
       "lib/**/*.js",
       "bin",

diff --git a/__tests__/lib/jest.js b/__tests__/lib/jest.js
@@ -2,9 +2,9 @@
 
 const jestUtils = require('../../lib/jest')
 
-const JEST_CONFIG_INDEX = 5
+const JEST_CONFIG_INDEX = 4
 
-describe('test.js', () => {
+describe('jest.js', () => {
   it('generateTestConfig should generate proper config', () => {
     const cfg = jestUtils.generateTestConfig(['these', 'files', 'only'], {
       cache: false,

diff --git a/bin/mastarm-test b/bin/mastarm-test
@@ -25,6 +25,7 @@ commander
     '--coverage-paths <paths>',
     'Extra paths to collect code coverage from'
   )
+  .option('--force-exit', 'Force Jest to exit after all tests have completed running.')
   .option('--no-cache', 'Run Jest without cache (defaults to using cache)')
   .option('--run-in-band', 'Run all tests serially in the current process')
   .option('--setup-files <paths>', 'Setup files to run before each test')

diff --git a/lib/jest.js b/lib/jest.js
@@ -4,7 +4,6 @@ const pkg = require('./pkg')
 module.exports.generateTestConfig = (patterns, options) => {
   // jest config params
   const jestConfig = {
-    cacheDirectory: 'tmp',
     collectCoverage: options.coverage,
     collectCoverageFrom: ['lib/**/*.js'],
     coverageDirectory: 'coverage',
@@ -42,7 +41,12 @@ module.exports.generateTestConfig = (patterns, options) => {
   }
 
   // jest cli params
-  let jestArguments = ['--forceExit']
+  let jestArguments = []
+
+  if (options.forceExit) {
+    jestArguments.push('--forceExit')
+  }
+
   if (options.updateSnapshots) {
     jestArguments.push('--updateSnapshot')
   }