feat(test): better interop and --files option

cmds/test.js

@@ -26,6 +26,12 @@ module.exports = {
     updateSnapshot: {
       alias: 'u',
       describe: 'Use this flag to re-record every snapshot that fails during this test run. (node only)'
+    },
+    files: {
+      alias: 'f',
+      describe: 'Custom globs for files to test',
+      type: 'array',
+      default: []
     }
   },
   handler (argv) {

src/config/jest-setup.js

@@ -0,0 +1,6 @@
+/* eslint-env jest */
+'use strict'
+
+// Setup aliases to keep api consistent with mocha
+global.before = beforeAll
+global.after = afterAll

src/config/jest.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const path = require('path')
+
 module.exports = {
   testMatch: [
     '**/test/**/?(*.)spec.js?(x)',
@@ -9,6 +11,7 @@ module.exports = {
     '/node_modules/',
     '/src/'
   ],
+  setupTestFrameworkScriptFile: path.join(__dirname, 'jest-setup.js'),
   rootDir: process.cwd(),
   collectCoverageFrom: [
     '**/src/**/*.js',

src/test/browser-config.js

@@ -1,21 +1,31 @@
 'use strict'
 
 const path = require('path')
+const _ = require('lodash')
+
 const timeout = require('../config/custom').timeout
-const user = require('../config/user')().karma
+const user = require('../config/user')
 
 const CONFIG_FILE = path.join(__dirname, '..', 'config', 'karma.conf.js')
 
-const userFiles = user.files != null ? user.files : []
+function getPatterns (ctx) {
+  if (ctx.files && ctx.files.length > 0) {
+    return ctx.files
+  }
+
+  return [
+    'test/browser.js',
+    'test/**/*.spec.js'
+  ]
+}
 
-const webworkerClient = {
-  mochaWebWorker: {
-    pattern: [
-      'test/browser.js',
-      'test/**/*.spec.js'
-    ],
-    mocha: {
-      timeout: timeout
+function webworkerClient (ctx) {
+  return {
+    mochaWebWorker: {
+      pattern: getPatterns(ctx),
+      mocha: {
+        timeout: timeout
+      }
     }
   }
 }
@@ -27,7 +37,7 @@ const defaultClient = {
 }
 
 function getConfig (isWebworker, ctx) {
-  return {
+  return _.defaultsDeep({}, user().karma, {
     configFile: CONFIG_FILE,
     singleRun: !ctx.watch,
     watch: ctx.watch,
@@ -37,19 +47,18 @@ function getConfig (isWebworker, ctx) {
     mochaOwnReporter: {
       reporter: ctx.verbose ? 'spec' : 'progress'
     },
-    files: [{
-      pattern: 'test/browser.js',
-      included: !isWebworker
-    }, {
-      pattern: 'test/**/*.spec.js',
-      included: !isWebworker
-    }, {
-      pattern: 'test/fixtures/**/*',
-      watched: false,
-      served: true,
-      included: false
-    }].concat(userFiles)
-  }
+    files: [
+      getPatterns(ctx).map((pattern) => ({
+        pattern: pattern,
+        included: !isWebworker
+      })), {
+        pattern: 'test/fixtures/**/*',
+        watched: false,
+        served: true,
+        included: false
+      }
+    ]
+  })
 }
 
 module.exports = getConfig

src/test/node.js

@@ -24,7 +24,7 @@ function testNode (ctx) {
     args.push('--updateSnapshot')
   }
 
-  const res = execa('jest', args, {
+  const res = execa('jest', args.concat(ctx.files), {
     cwd: process.cwd()
   })
   res.stdout.pipe(process.stdout)

test/config/user.spec.js

@@ -1,9 +1,10 @@
+/* eslint-env mocha */
 /* eslint-env jest */
 'use strict'
 
 describe('config - user', () => {
   let config
-  beforeAll(() => {
+  before(() => {
     jest.mock('../../src/utils', () => ({
       getPkg () {
         return Promise.resolve({
@@ -31,7 +32,7 @@ describe('config - user', () => {
     config = require('../../src/config/user')()
   })
 
-  afterAll(() => {
+  after(() => {
     jest.resetAllMocks()
   })