Updates

src/commands/test.js

@@ -9,11 +9,6 @@ const fs = require('fs');
 
 function runTests(files, { coverage, nyc, mocha }) {
   const n = new NYC(nyc);
-  if (coverage) {
-    n.reset();
-    n.wrap();
-    n.addAllFiles();
-  }
   const m = new Mocha(mocha);
   files.forEach((f) => {
     Object.keys(require.cache).forEach((key) => {
@@ -23,7 +18,11 @@ function runTests(files, { coverage, nyc, mocha }) {
     });
     m.addFile(f);
   });
-
+  if (coverage) {
+    n.reset();
+    n.wrap();
+    n.addAllFiles();
+  }
   const runner = m.run((failures) => {
     process.on('exit', () => {
       process.exit(failures);
@@ -66,7 +65,7 @@ const command = {
     },
     'nyc.exclude': {
       description: 'Exclude glob',
-      default: [],
+      default: ['coverage'],
       type: 'array',
     },
     'nyc.sourceMap': {

src/commands/webdriver.js

@@ -42,7 +42,7 @@ const command = {
       const p = path.resolve(process.cwd(), foundConfigPath);
       const foundConfig = require(p);
       if (typeof foundConfig === 'function') {
-        config = extend(true, baseConfig, foundConfig());
+        config = extend(true, baseConfig, foundConfig(baseConfig));
       } else {
         config = extend(true, baseConfig, foundConfig);
       }

src/config/webdriver-config.js

@@ -10,6 +10,7 @@ module.exports = function initConfig() {
   const reporterPlugin = {
   };
   const config = {
+    artifactsPath: 'test/component/artifacts',
     // ---------------------------------------------------------------------------
     // ----- How to connect to Browser Drivers -----------------------------------
     // ---------------------------------------------------------------------------