From ddb899b8b7e3e8531c48dd052bf7c4aad8dfb6a4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Mon, 16 Nov 2020 16:03:42 +0100 Subject: [PATCH] Adjust for new karma config changes and test with firefox as well --- packages/provider/karma.conf.js | 29 +---------------------------- packages/provider/package.json | 2 +- packages/provider/rollup.config.js | 4 ++-- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/packages/provider/karma.conf.js b/packages/provider/karma.conf.js index 8545f1b0..ca038af2 100644 --- a/packages/provider/karma.conf.js +++ b/packages/provider/karma.conf.js @@ -1,28 +1 @@ -// Trick to use the auto-downloaded puppeteer chrome binary -process.env.CHROME_BIN = require('puppeteer').executablePath(); - -module.exports = function(config) { - config.set({ - basePath: 'dist', - frameworks: ['mocha', 'chai'], - client: { - mocha: { - ui: 'tdd', - }, - }, - files: [ - {pattern: './*.js', included: true, watched: true, served: true, type: 'module'}, - {pattern: './**/*', included: false, watched: true, served: true}, - ], - autoWatch: true, - browsers: ['ChromeHeadlessNoSandbox'], - customLaunchers: { - ChromeHeadlessNoSandbox: { - base: 'ChromeHeadless', - flags: ['--no-sandbox'] - } - }, - singleRun: false, - logLevel: config.LOG_ERROR - }); -} +module.exports = require('../../karma.common.conf.js'); diff --git a/packages/provider/package.json b/packages/provider/package.json index 84a97127..afd332e9 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -14,9 +14,9 @@ "i18next-scanner": "^2.10.2", "karma": "^5.1.0", "karma-chrome-launcher": "^3.0.0", + "karma-firefox-launcher": "^1.3.0", "karma-mocha": "^2.0.1", "mocha": "^8.0.1", - "puppeteer": "^5.3.1", "rollup": "^2.19.0", "rollup-plugin-consts": "^1.0.1", "rollup-plugin-copy": "^3.1.0", diff --git a/packages/provider/rollup.config.js b/packages/provider/rollup.config.js index 469b12bc..4923379d 100644 --- a/packages/provider/rollup.config.js +++ b/packages/provider/rollup.config.js @@ -50,8 +50,8 @@ export default (async () => { sourcemap: true }, onwarn: function (warning, warn) { - // keycloak bundled code uses eval - if (warning.code === 'EVAL') { + // ignore chai warnings + if (warning.code === 'CIRCULAR_DEPENDENCY') { return; } warn(warning); -- GitLab