Merge pull request #55 from conveyal/dev

Merge in latest Jest work

Author: evansiroky

lib/babel-config.js

@@ -0,0 +1,11 @@
+module.exports = {
+  presets: [
+    require('babel-preset-es2015'),
+    require('babel-preset-react'),
+    require('babel-preset-stage-0')
+  ],
+  plugins: [
+    require('babel-plugin-add-module-exports'),
+    require('babel-plugin-transform-runtime')
+  ]
+}

lib/jest-preprocessor.js

@@ -1,15 +1,10 @@
 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')
+
+const transformCfg = require('./babel-config')
 
 module.exports = {
   process: function (src) {
-    const transformCfg = {
-      presets: [babel2015, reactPreset, stage0Preset, jestPreset],
-      retainLines: true
-    }
+    transformCfg.retainLines = true
     return babel.transform(src, transformCfg).code
   }
 }

lib/js-transform.js

@@ -4,17 +4,7 @@ const markdown = require('browserify-markdown')
 const through = require('through2')
 const YAML = require('yamljs')
 
-const babelifyConfig = {
-  presets: [
-    require('babel-preset-es2015'),
-    require('babel-preset-react'),
-    require('babel-preset-stage-0')
-  ],
-  plugins: [
-    require('babel-plugin-add-module-exports'),
-    require('babel-plugin-transform-runtime')
-  ]
-}
+const babelifyConfig = require('./babel-config')
 
 module.exports = function transform ({
   config,

lib/test.js

@@ -15,7 +15,7 @@ module.exports.generateTestConfig = (patterns, options) => {
   }
 
   if (options.setupFiles) {
-    jestConfig.setupFiles = options.setupFiles
+    jestConfig.setupFiles = options.setupFiles.split(' ')
   }
 
   // jest cli params

tests/lib/test.test.js

@@ -8,7 +8,7 @@ describe('test.js', () => {
       coveragePaths: 'bin src another-folder',
       updateSnapshots: true,
       cache: false,
-      setupFiles: ['beforeTestsSetup.js']
+      setupFiles: 'beforeTestsSetup.js'
     })
     expect(cfg).toBeTruthy()
     expect(cfg.length).toEqual(7)