Merge pull request #106 from conveyal/dev

3.2.0

README.md

@@ -165,6 +165,7 @@ Options:
   --no-cache                              Run Jest without cache (defaults to using cache)
   --coverage-paths <paths>                Extra paths to collect code coverage from
   --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

@@ -23,6 +23,7 @@ Object {
   "setupFiles": Array [
     "beforeTestsSetup.js",
   ],
+  "testEnvironment": "node",
   "testPathIgnorePatterns": Array [
     "<rootDir>/node_modules/",
     "<rootDir>/__tests__/test-utils",

__tests__/lib/test.js

@@ -5,10 +5,11 @@ const testUtils = require('../../lib/test')
 describe('test.js', () => {
   it('generateTestConfig should generate proper config', () => {
     const cfg = testUtils.generateTestConfig(['these', 'files', 'only'], {
-      coveragePaths: 'bin src another-folder',
-      updateSnapshots: true,
       cache: false,
-      setupFiles: 'beforeTestsSetup.js'
+      coveragePaths: 'bin src another-folder',
+      setupFiles: 'beforeTestsSetup.js',
+      testEnvironment: 'node',
+      updateSnapshots: true
     })
     expect(cfg).toBeTruthy()
     expect(cfg.length).toEqual(7)

bin/mastarm

@@ -124,6 +124,7 @@ commander
   .option('--no-cache', 'Run Jest without cache (defaults to using cache)')
   .option('--coverage-paths <paths>', 'Extra paths to collect code coverage from')
   .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')

lib/test.js

@@ -16,6 +16,10 @@ module.exports.generateTestConfig = (patterns, options) => {
     jestConfig.collectCoverageFrom = jestConfig.collectCoverageFrom.concat(options.coveragePaths.split(' '))
   }
 
+  if (options.testEnvironment) {
+    jestConfig.testEnvironment = options.testEnvironment
+  }
+
   const stringArrayOverrides = [
     'setupFiles',
     'testPathIgnorePatterns'

package.json

@@ -10,9 +10,9 @@
     "mastarm": "bin/mastarm"
   },
   "scripts": {
-    "cover": "bin/mastarm test --env test --coverage --coverage-paths bin",
+    "cover": "bin/mastarm test --env test --test-environment node --coverage --coverage-paths bin",
     "semantic-release": "semantic-release pre && npm publish && semantic-release post",
-    "test": "bin/mastarm lint && bin/mastarm test --env test"
+    "test": "bin/mastarm lint && bin/mastarm test --env test --test-environment node"
   },
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-flow-strip-types": "^6.18.0",
     "babel-plugin-transform-runtime": "^6.9.0",
-    "babel-preset-env": "^0.0.9",
+    "babel-preset-env": "^1.1.0",
     "babel-preset-react": "^6.5.0",
     "babel-preset-stage-2": "^6.17.0",
     "babelify": "^7.3.0",
@@ -62,7 +62,7 @@
     "postcss": "^5.0.21",
     "postcss-cssnext": "^2.6.0",
     "postcss-import": "^9.0.0",
-    "postcss-reporter": "^2.0.0",
+    "postcss-reporter": "^3.0.0",
     "postcss-safe-parser": "^2.0.0",
     "rimraf": "^2.5.4",
     "standard": "^8.3.0",