rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00
Code Issues Actions Packages Releases Activity

Partially backport #33045

Browse Source 
Simplify karma.conf.js

`customLaunchers` does not seem to be needed.
This commit is contained in:
XhmikosR 2021-02-16 13:12:23 +02:00
parent 23a26e12ff
commit c341721439
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/tests/karma.conf.js
View File

@ -28,7 +28,12 @@ const reporters = ['dots']
const detectBrowsers = { const detectBrowsers = {
usePhantomJS: false, usePhantomJS: false,
postDetection(availableBrowser) { 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'] return ['ChromeHeadless']
} }
@ -44,13 +49,6 @@ const detectBrowsers = {
} }
} }
const customLaunchers = {
FirefoxHeadless: {
base: 'Firefox',
flags: ['-headless']
}
}
let files = [ let files = [
'node_modules/popper.js/dist/umd/popper.min.js', 'node_modules/popper.js/dist/umd/popper.min.js',
'node_modules/hammer-simulator/index.js' 'node_modules/hammer-simulator/index.js'
@ -77,7 +75,6 @@ if (BUNDLE) {
'karma-firefox-launcher', 'karma-firefox-launcher',
'karma-detect-browsers' 'karma-detect-browsers'
) )
conf.customLaunchers = customLaunchers
conf.detectBrowsers = detectBrowsers conf.detectBrowsers = detectBrowsers
files = [...files, files = [...files,
JQUERY_FILE, JQUERY_FILE,
@ -114,7 +111,6 @@ if (BUNDLE) {
'js/coverage/dist/tooltip.js', 'js/coverage/dist/tooltip.js',
// include all of our js/dist files except util.js, index.js and tooltip.js // include all of our js/dist files except util.js, index.js and tooltip.js
'js/coverage/dist/!(util|index|tooltip).js'] 'js/coverage/dist/!(util|index|tooltip).js']
conf.customLaunchers = customLaunchers
conf.detectBrowsers = detectBrowsers conf.detectBrowsers = detectBrowsers
if (!USE_OLD_JQUERY) { if (!USE_OLD_JQUERY) {
plugins.push('karma-coverage-istanbul-reporter') plugins.push('karma-coverage-istanbul-reporter')