diff options
| author | XhmikosR <[email protected]> | 2021-02-16 13:12:23 +0200 |
|---|---|---|
| committer | XhmikosR <[email protected]> | 2021-02-17 06:54:38 +0200 |
| commit | c3417214392537e70ef4e6aaa8d11b3322e01f30 (patch) | |
| tree | 35a4267128de61eae1619094710a0efe7f3da58b | |
| parent | 23a26e12ff2fc42a00d16a4bb7fbd056f23b9833 (diff) | |
| download | bootstrap-c3417214392537e70ef4e6aaa8d11b3322e01f30.tar.xz bootstrap-c3417214392537e70ef4e6aaa8d11b3322e01f30.zip | |
Partially backport #33045
Simplify karma.conf.js
`customLaunchers` does not seem to be needed.
| -rw-r--r-- | js/tests/karma.conf.js | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index 94ea91c6c..341db2428 100644 --- a/js/tests/karma.conf.js +++ b/js/tests/karma.conf.js @@ -28,7 +28,12 @@ const reporters = ['dots'] const detectBrowsers = { usePhantomJS: false, postDetection(availableBrowser) { - if (process.env.CI === true || availableBrowser.includes('Chrome')) { + // On CI just use Chrome + if (process.env.CI === true) { + return ['ChromeHeadless'] + } + + if (availableBrowser.includes('Chrome')) { return ['ChromeHeadless'] } @@ -44,13 +49,6 @@ const detectBrowsers = { } } -const customLaunchers = { - FirefoxHeadless: { - base: 'Firefox', - flags: ['-headless'] - } -} - let files = [ 'node_modules/popper.js/dist/umd/popper.min.js', 'node_modules/hammer-simulator/index.js' @@ -77,7 +75,6 @@ if (BUNDLE) { 'karma-firefox-launcher', 'karma-detect-browsers' ) - conf.customLaunchers = customLaunchers conf.detectBrowsers = detectBrowsers files = [...files, JQUERY_FILE, @@ -114,7 +111,6 @@ if (BUNDLE) { 'js/coverage/dist/tooltip.js', // include all of our js/dist files except util.js, index.js and tooltip.js 'js/coverage/dist/!(util|index|tooltip).js'] - conf.customLaunchers = customLaunchers conf.detectBrowsers = detectBrowsers if (!USE_OLD_JQUERY) { plugins.push('karma-coverage-istanbul-reporter') |
