Merge pull request #36 from conveyal/test-improvements

More testing features

Author: evansiroky

README.md

@@ -112,6 +112,18 @@ Run the [Jest](http://facebook.github.io/jest/) test runner on your project.  It
 
 ```shell
 $ mastarm test
+
+Usage: test [options]
+
+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
+
 ```
 
 [npm-image]: https://img.shields.io/npm/v/mastarm.svg?maxAge=2592000&style=flat-square

bin/mastarm

@@ -148,11 +148,14 @@ commander
   .command('test')
   .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')
   .action(function (options) {
     const jest = require('jest')
     const config = loadConfig(process.cwd(), commander.config, commander.env)
-    const generateTestConfig = require('../lib/test.js')
-    jest.run(generateTestConfig(config, options))
+    const testUtils = require('../lib/test')
+    testUtils.setupTestEnvironment(config)
+    jest.run(testUtils.generateTestConfig(options))
   })
 
 commander.parse(process.argv)

lib/jestPreprocessor.js

@@ -0,0 +1,15 @@
+const babel = require('babel-core')
+const babel2015 = require('babel-preset-es2015')
+const jestPreset = require('babel-preset-jest')
+const reactPreset = require('babel-preset-react')
+const stage0Preset = require('babel-preset-stage-0')
+
+module.exports = {
+  process: function (src) {
+    const transformCfg = {
+      presets: [babel2015, reactPreset, stage0Preset, jestPreset],
+      retainLines: true
+    }
+    return babel.transform(src, transformCfg).code
+  }
+}

lib/test.js

@@ -1,17 +1,26 @@
+const path = require('path')
 
-module.exports = function generateTestConfig (config, options) {
-  if (config.messages) {
-    process.env.MESSAGES = JSON.stringify(config.messages)
-  }
+module.exports.generateTestConfig = (options) => {
   const jestConfig = {
-    collectCoverage: true,
+    cacheDirectory: 'tmp',
+    collectCoverage: options.coverage,
     collectCoverageFrom: ['lib/**/*.js'],
-    coverageDirectory: 'coverage'
+    coverageDirectory: 'coverage',
+    scriptPreprocessor: path.resolve(__dirname, 'jestPreprocessor.js')
   }
   const jestArguments = []
   if (options.updateSnapshots) {
     jestArguments.push('-u')
   }
+  if (options.cache === false) {
+    jestArguments.push('--no-cache')
+  }
   jestArguments.push('--config', JSON.stringify(jestConfig))
   return jestArguments
 }
+
+module.exports.setupTestEnvironment = (config) => {
+  if (config.messages) {
+    process.env.MESSAGES = JSON.stringify(config.messages)
+  }
+}