Merge pull request #113 from conveyal/dev

Merge dev into master

Author: evansiroky

README.md

@@ -162,8 +162,9 @@ Options:
   -h, --help                              output usage information
   -u, --update-snapshots                  Force update of snapshots. USE WITH CAUTION.
   --coverage                              Run Jest with coverage reporting
-  --no-cache                              Run Jest without cache (defaults to using cache)
   --coverage-paths <paths>                Extra paths to collect code coverage from
+  --no-cache                              Run Jest without cache (defaults to using cache)
+  --run-in-band                           Run all tests serially in the current process
   --setup-files <paths>                   Setup files to run before each test
   --test-environment <env>                Jest test environment to use (Jest default is jsdom)
   --test-path-ignore-patterns <patterns>  File patterns to ignore when scanning for test files

__tests__/lib/__snapshots__/test.js.snap __tests__/lib/__snapshots__/jest.js.snap

@@ -2,6 +2,7 @@ exports[`test.js generateTestConfig should generate proper config 1`] = `
 Array [
   "-u",
   "--no-cache",
+  "-i",
   "--config",
   "these",
   "files",

lib/__tests__/babel.js __tests__/lib/babel.js

@@ -1,19 +1,20 @@
 /* globals describe, it, expect */
 
-const testUtils = require('../../lib/test')
+const jestUtils = require('../../lib/jest')
 
 describe('test.js', () => {
   it('generateTestConfig should generate proper config', () => {
-    const cfg = testUtils.generateTestConfig(['these', 'files', 'only'], {
+    const cfg = jestUtils.generateTestConfig(['these', 'files', 'only'], {
       cache: false,
       coveragePaths: 'bin src another-folder',
+      runInBand: true,
       setupFiles: 'beforeTestsSetup.js',
       testEnvironment: 'node',
       updateSnapshots: true
     })
     expect(cfg).toBeTruthy()
-    expect(cfg.length).toEqual(7)
-    const jestCfg = JSON.parse(cfg.splice(3, 1))
+    expect(cfg.length).toEqual(8)
+    const jestCfg = JSON.parse(cfg.splice(4, 1))
     expect(cfg).toMatchSnapshot()
     expect(jestCfg.transform['.*']).toContain('lib/jest-preprocessor.js')
     delete jestCfg.transform

__tests__/lib/test.js __tests__/lib/jest.js

@@ -4,8 +4,8 @@ const BUILD_DIR = '__tests__/test-utils/tmp'
 const MOCK_DIR = '__tests__/test-utils/mocks'
 
 describe('lib > push to s3', () => {
-  const configPush = require('../push-to-s3')
-  const loadConfig = require('../load-config')
+  const configPush = require('../../lib/push-to-s3')
+  const loadConfig = require('../../lib/load-config')
 
   it('should compile JavaScript and CSS and send to s3 via aws-sdk', () => {
     const config = loadConfig(process.cwd(), '~/mastarm/configurations/default', 'test')

lib/__tests__/push-to-s3.js __tests__/lib/push-to-s3.js

@@ -121,18 +121,19 @@ commander
   .description('Run tests using Jest')
   .option('-u, --update-snapshots', 'Force update of snapshots. USE WITH CAUTION.')
   .option('--coverage', 'Run Jest with coverage reporting')
-  .option('--no-cache', 'Run Jest without cache (defaults to using cache)')
   .option('--coverage-paths <paths>', 'Extra paths to collect code coverage from')
+  .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')
   .option('--test-environment <env>', 'Jest test environment to use (Jest default is jsdom)')
   .option('--test-path-ignore-patterns <patterns>', 'File patterns to ignore when scanning for test files')
   .action(function (patterns, options) {
     const jest = require('jest')
     const config = loadConfig(process.cwd(), commander.config, commander.env)
     const get = util.makeGetFn([options, commander, config.settings])
-    const testUtils = require('../lib/test')
+    const jestUtils = require('../lib/jest')
     util.configureEnvironment({config, env: get('env')})
-    jest.run(testUtils.generateTestConfig(patterns, options))
+    jest.run(jestUtils.generateTestConfig(patterns, options))
   })
 
 commander.parse(process.argv)

bin/mastarm

@@ -41,6 +41,10 @@ module.exports.generateTestConfig = (patterns, options) => {
     jestArguments.push('--no-cache')
   }
 
+  if (options.runInBand || process.env.CI) {
+    jestArguments.push('-i')
+  }
+
   jestArguments.push('--config', JSON.stringify(jestConfig))
 
   if (patterns) {

lib/test.js lib/jest.js

@@ -55,7 +55,7 @@
     "exorcist": "^0.4.0",
     "http-proxy": "^1.14.0",
     "isomorphic-fetch": "^2.2.1",
-    "jest": "^17.0.3",
+    "jest": "^18.1.0",
     "lodash.uniq": "^4.5.0",
     "mime": "^1.3.4",
     "mkdirp": "^0.5.1",