fix: update to latest versions of testing

Author: daKmoR

karma.conf.js

@@ -1,27 +1,27 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const createBaseConfig = require('@open-wc/testing-karma/create-karma-config');
+/* eslint-disable import/no-extraneous-dependencies */
+const defaultSettings = require('@open-wc/testing-karma/default-settings.js');
+const merge = require('webpack-merge');
 
-module.exports = (config) => {
-  const baseConfig = createBaseConfig(config);
+module.exports = config => {
+  config.set(
+    merge(defaultSettings(config), {
+      files: [
+        // allows running single tests with the --grep flag
+        config.grep ? config.grep : 'test/**/*.test.js',
+      ],
 
-  config.set({
-    ...baseConfig,
-
-    files: [
-      // allows running single tests with the --grep flag
-      config.grep ? config.grep : 'test/**/*.test.js',
-    ],
-
-    // TODO: not yet within the 90% default
-    coverageIstanbulReporter: {
-      thresholds: {
-        global: {
-          statements: 80,
-          branches: 70,
-          functions: 70,
-          lines: 80,
+      // TODO: not yet within the 90% default
+      coverageIstanbulReporter: {
+        thresholds: {
+          global: {
+            statements: 80,
+            branches: 70,
+            functions: 70,
+            lines: 80,
+          },
         },
       },
-    },
-  });
+    }),
+  );
+  return config;
 };

karma.es5.bs.config.js

@@ -1,42 +1,13 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const createBaseConfig = require('@open-wc/testing-karma-bs/create-karma-es5-bs.config');
-
-module.exports = (config) => {
-  const baseConfig = createBaseConfig(config);
-
-  config.set({
-    ...baseConfig,
-
-    files: [
-      ...baseConfig.files,
-      // allows running single tests with the --grep flag
-      config.grep ? [config.grep] : 'test/**/*.test.js',
-    ],
+/* eslint-disable import/no-extraneous-dependencies */
+const merge = require('webpack-merge');
+const bsSettings = require('@open-wc/testing-karma-bs/bs-settings.js');
+const karmaEs5Config = require('./karma.es5.config.js');
 
+module.exports = config => {
+  config.set(merge(bsSettings(config), karmaEs5Config(config), {
     browserStack: {
-      ...baseConfig.browserStack,
-      project: 'example-vanilla-set-game',
-    },
-
-    // just an example build for chrome only
-    browsers: [
-      'bs_win10_chrome_latest',
-      // 'bs_win10_firefox_latest',
-      // 'bs_win10_edge_latest',
-      // 'bs_osxmojave_safari_latest',
-      // 'bs_win10_ie_11',
-    ],
-
-    // TODO: not yet within the 90% default
-    coverageIstanbulReporter: {
-      thresholds: {
-        global: {
-          statements: 80,
-          branches: 70,
-          functions: 70,
-          lines: 80,
-        },
-      },
-    },
-  });
+      project: 'your-name',
+    }
+  }));
+  return config;
 };

karma.es5.config.js

@@ -0,0 +1,9 @@
+/* eslint-disable import/no-extraneous-dependencies */
+const merge = require('webpack-merge');
+const es5Settings = require('@open-wc/testing-karma/es5-settings.js');
+const karmaConf = require('./karma.conf.js');
+
+module.exports = config => {
+  config.set(merge(es5Settings(config), karmaConf(config)));
+  return config;
+};

package.json

@@ -17,14 +17,17 @@
     "storybook:start": "start-storybook -p 9001",
     "test": "karma start",
     "test:watch": "karma start --auto-watch=true --single-run=false",
+    "test:es5": "karma start karma.es5.config.js",
+    "test:es5:watch": "karma start karma.es5.config.js --auto-watch=true --single-run=false",
     "test:es5:bs": "karma start karma.es5.bs.config.js"
   },
   "devDependencies": {
     "@open-wc/eslint-config": "^0.3.0",
     "@open-wc/storybook": "^0.2.0",
-    "@open-wc/testing": "^0.7.0",
-    "@open-wc/testing-karma": "^0.3.0",
-    "@open-wc/testing-karma-bs": "^0.1.0",
-    "@open-wc/testing-wallaby": "^0.1.3"
+    "@open-wc/testing": "^0.8.0",
+    "@open-wc/testing-karma": "^0.4.0",
+    "@open-wc/testing-karma-bs": "^0.2.0",
+    "@open-wc/testing-wallaby": "^0.1.3",
+    "webpack-merge": "^4.1.5"
   }
 }