mirror of
https://github.com/twbs/bootstrap.git
synced 2025-01-17 09:52:29 +01:00
tests: use jQuery from node_modules. (#28059)
This commit is contained in:
parent
0828b88563
commit
3aeda9942d
@ -6,19 +6,7 @@
|
|||||||
<title>Bootstrap Plugin Test Suite</title>
|
<title>Bootstrap Plugin Test Suite</title>
|
||||||
|
|
||||||
<!-- jQuery -->
|
<!-- jQuery -->
|
||||||
<script>
|
<script src="../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
(function () {
|
|
||||||
var path = '../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js'
|
|
||||||
// get jquery param from the query string.
|
|
||||||
var jQueryVersion = location.search.match(/[?&]jquery=(.*?)(?=&|$)/)
|
|
||||||
|
|
||||||
// If a version was specified, use that version from jQuery CDN
|
|
||||||
if (jQueryVersion) {
|
|
||||||
path = 'https://code.jquery.com/jquery-' + jQueryVersion[1] + '.min.js'
|
|
||||||
}
|
|
||||||
document.write('<script src="' + path + '"><\/script>')
|
|
||||||
}())
|
|
||||||
</script>
|
|
||||||
<script src="../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
|
|
||||||
<!-- QUnit -->
|
<!-- QUnit -->
|
||||||
|
@ -2,15 +2,12 @@
|
|||||||
/* eslint no-process-env: 0 */
|
/* eslint no-process-env: 0 */
|
||||||
|
|
||||||
const ip = require('ip')
|
const ip = require('ip')
|
||||||
const pkg = require('../../package.json')
|
|
||||||
const {
|
const {
|
||||||
browsers,
|
browsers,
|
||||||
browsersKeys
|
browsersKeys
|
||||||
} = require('./browsers')
|
} = 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 bundle = process.env.BUNDLE === 'true'
|
||||||
const browserStack = process.env.BROWSER === 'true'
|
const browserStack = process.env.BROWSER === 'true'
|
||||||
|
|
||||||
@ -94,7 +91,7 @@ if (bundle) {
|
|||||||
conf.browsers = browsersKeys
|
conf.browsers = browsersKeys
|
||||||
reporters.push('BrowserStack')
|
reporters.push('BrowserStack')
|
||||||
files = files.concat([
|
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/util.js',
|
||||||
'js/dist/tooltip.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
|
'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.customLaunchers = customLaunchers
|
||||||
conf.detectBrowsers = detectBrowsers
|
conf.detectBrowsers = detectBrowsers
|
||||||
conf.coverageIstanbulReporter = {
|
conf.coverageIstanbulReporter = {
|
||||||
dir: jsCoveragePath,
|
dir: '../coverage/',
|
||||||
reports: ['lcov', 'text-summary'],
|
reports: ['lcov', 'text-summary'],
|
||||||
thresholds: {
|
thresholds: {
|
||||||
emitWarning: false,
|
emitWarning: false,
|
||||||
|
@ -51,7 +51,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/alert.js"></script>
|
<script src="../../dist/alert.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/button.js"></script>
|
<script src="../../dist/button.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/carousel.js"></script>
|
<script src="../../dist/carousel.js"></script>
|
||||||
<script>
|
<script>
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/collapse.js"></script>
|
<script src="../../dist/collapse.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
@ -203,7 +203,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/dropdown.js"></script>
|
<script src="../../dist/dropdown.js"></script>
|
||||||
|
@ -205,7 +205,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/modal.js"></script>
|
<script src="../../dist/modal.js"></script>
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/tooltip.js"></script>
|
<script src="../../dist/tooltip.js"></script>
|
||||||
|
@ -86,7 +86,7 @@
|
|||||||
<p>Ad leggings keytar, brunch id art party dolor labore.</p>
|
<p>Ad leggings keytar, brunch id art party dolor labore.</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/scrollspy.js"></script>
|
<script src="../../dist/scrollspy.js"></script>
|
||||||
<script src="../../dist/dropdown.js"></script>
|
<script src="../../dist/dropdown.js"></script>
|
||||||
|
@ -225,7 +225,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/tab.js"></script>
|
<script src="../../dist/tab.js"></script>
|
||||||
|
@ -52,7 +52,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/toast.js"></script>
|
<script src="../../dist/toast.js"></script>
|
||||||
<script>
|
<script>
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
<div id="customContainer"></div>
|
<div id="customContainer"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="../../../site/docs/4.2/assets/js/vendor/jquery-slim.min.js"></script>
|
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
|
||||||
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
|
||||||
<script src="../../dist/util.js"></script>
|
<script src="../../dist/util.js"></script>
|
||||||
<script src="../../dist/tooltip.js"></script>
|
<script src="../../dist/tooltip.js"></script>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user