Merge pull request #51 from conveyal/dev

Merge latest Jest changes into master to create a new version

Author: evansiroky

README.md

@@ -68,7 +68,7 @@ $ mastarm --help
 Compile JS, HTML, CSS, YAML, Markdown into a single `.js`. Utilizes [babel](https://babeljs.io/), [browserify](https://github.com/substack/node-browserify), [budo](https://github.com/mattdesl/budo), and [postcss](http://postcss.org/).
 
 ```shell
-$ mastarm build [entries...] [options]
+$ mastarm build [options] [entries...]
 
   Options:
 
@@ -98,7 +98,7 @@ Build, push to S3, and invalidate CloudFront in one command.
 ```shell
 $ mastarm deploy --help
 
-Usage: deploy [entries...] [options]
+Usage: deploy [options] [entries...]
 
 Bundle & Deploy JavaScript & CSS
 
@@ -115,7 +115,7 @@ Options:
 Lint using [Standard](http://standardjs.com/). Everything is passed directly to [`standard-engine`](https://github.com/Flet/standard-engine).
 
 ```shell
-$ mastarm lint
+$ mastarm lint [paths...]
 ```
 
 You can optionally pass in a directory (or directories) using the glob pattern. Be sure to quote paths containing glob patterns so that they are expanded by standard instead of your shell:
@@ -128,21 +128,23 @@ Note: by default standard will look for all files matching the patterns: `"**/*.
 
 ### `test`
 
-Run the [Jest](http://facebook.github.io/jest/) test runner on your project.  It is expected that you create tests within your project.  By default, mastarm will run Jest and generate coverage reports on all .js files in the `lib` folder of your project.
+Run the [Jest](http://facebook.github.io/jest/) test runner on your project.  It is expected that you create tests within your project.  By default, mastarm will run Jest and generate coverage reports on all .js files in the `lib` folder of your project.  The `patterns` argument will make Jest run only tests whose filename match the provided pattern.
 
 ```shell
 $ mastarm test
 
-Usage: test [options]
+Usage: test [options] [patterns...]
 
 Run tests using Jest
 
 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
+  -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 with cache
+  --coverage-paths <paths>  Extra paths to collect code coverage from
+  --setup-files <paths>     Setup files to run before each test
 
 ```
 

bin/mastarm

@@ -155,19 +155,20 @@ commander
   })
 
 commander
-  .command('test')
+  .command('test [patterns...]')
   .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 with cache')
-  .option('--coverage-paths <paths>')
-  .action(function (options) {
+  .option('--coverage-paths <paths>', 'Extra paths to collect code coverage from')
+  .option('--setup-files <paths>', 'Setup files to run before each test')
+  .action(function (patterns, options) {
     checkDependencies()
     const jest = require('jest')
     const config = loadConfig(process.cwd(), commander.config, commander.env)
     const testUtils = require('../lib/test')
     testUtils.setupTestEnvironment(config)
-    jest.run(testUtils.generateTestConfig(options))
+    jest.run(testUtils.generateTestConfig(patterns, options))
   })
 
 commander.parse(process.argv)

lib/test.js

@@ -1,6 +1,6 @@
 const path = require('path')
 
-module.exports.generateTestConfig = (options) => {
+module.exports.generateTestConfig = (patterns, options) => {
   // jest config params
   const jestConfig = {
     cacheDirectory: 'tmp',
@@ -14,8 +14,12 @@ module.exports.generateTestConfig = (options) => {
     jestConfig.collectCoverageFrom = jestConfig.collectCoverageFrom.concat(options.coveragePaths.split(' '))
   }
 
+  if (options.setupFiles) {
+    jestConfig.setupFiles = options.setupFiles
+  }
+
   // jest cli params
-  const jestArguments = []
+  let jestArguments = []
   if (options.updateSnapshots) {
     jestArguments.push('-u')
   }
@@ -25,6 +29,10 @@ module.exports.generateTestConfig = (options) => {
   }
 
   jestArguments.push('--config', JSON.stringify(jestConfig))
+
+  if (patterns) {
+    jestArguments = jestArguments.concat(patterns)
+  }
   return jestArguments
 }
 

tests/lib/__snapshots__/test.test.js.snap

@@ -3,6 +3,9 @@ Array [
   "-u",
   "--no-cache",
   "--config",
+  "these",
+  "files",
+  "only",
 ]
 `;
 
@@ -16,6 +19,9 @@ Object {
     "another-folder",
   ],
   "coverageDirectory": "coverage",
+  "setupFiles": Array [
+    "beforeTestsSetup.js",
+  ],
 }
 `;
 

tests/lib/test.test.js

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