mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-20 04:11:39 +02:00
Code Issues Releases Wiki Activity

tests: use jQuery from node_modules. (#28059)

Browse Source
This commit is contained in:
XhmikosR
2019-01-15 18:01:40 +02:00
committed by GitHub
parent 0828b88563
commit 3aeda9942d
13 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,15 +2,12 @@
/* eslint no-process-env: 0 */
const ip = require('ip')
const pkg = require('../../package.json')
const {
browsers,
browsersKeys
} = require('./browsers')
const path = require('path')
const jsCoveragePath = path.resolve(__dirname, '../coverage')
const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : `site/docs/${pkg.version_short}/assets/js/vendor/jquery-slim.min.js`
const jqueryFile = process.env.USE_OLD_JQUERY ? 'https://code.jquery.com/jquery-1.9.1.min.js' : 'node_modules/jquery/dist/jquery.slim.min.js'
const bundle = process.env.BUNDLE === 'true'
const browserStack = process.env.BROWSER === 'true'
@@ -94,7 +91,7 @@ if (bundle) {
conf.browsers = browsersKeys
reporters.push('BrowserStack')
files = files.concat([
`site/docs/${pkg.version_short}/assets/js/vendor/jquery-slim.min.js`,
'node_modules/jquery/dist/jquery.slim.min.js',
'js/dist/util.js',
'js/dist/tooltip.js',
'js/dist/!(util|index|tooltip).js' // include all of our js/dist files except util.js, index.js and tooltip.js
@@ -117,7 +114,7 @@ if (bundle) {
conf.customLaunchers = customLaunchers
conf.detectBrowsers = detectBrowsers
conf.coverageIstanbulReporter = {
dir: jsCoveragePath,
dir: '../coverage/',
reports: ['lcov', 'text-summary'],
thresholds: {
emitWarning: false,