diff options
| author | XhmikosR <[email protected]> | 2019-01-15 18:01:40 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-01-15 18:01:40 +0200 |
| commit | 3aeda9942dc1743e982b2b6bfeee2e1cfbca2ec5 (patch) | |
| tree | b1c7362058235057fafee81dde18729fc94d177e /js/tests/karma.conf.js | |
| parent | 0828b885637f572fe13e060ccb6d34cdc14122c0 (diff) | |
| download | bootstrap-3aeda9942dc1743e982b2b6bfeee2e1cfbca2ec5.tar.xz bootstrap-3aeda9942dc1743e982b2b6bfeee2e1cfbca2ec5.zip | |
tests: use jQuery from node_modules. (#28059)
Diffstat (limited to 'js/tests/karma.conf.js')
| -rw-r--r-- | js/tests/karma.conf.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js index 06046ca8e..a6c690598 100644 --- a/js/tests/karma.conf.js +++ b/js/tests/karma.conf.js @@ -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, |