Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tests: use jQuery from node_modules. #28059

Merged
merged 3 commits into from Jan 15, 2019
Merged

tests: use jQuery from node_modules. #28059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f67561
tests: use jQuery from node_modules.
XhmikosR Sep 28, 2018
a730e64
Nuke
XhmikosR Jan 15, 2019
4e679c9
Update karma.conf.js
XhmikosR Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 1 addition & 13 deletions js/tests/index.html
View file
Open in desktop
Expand Up @@ -6,19 +6,7 @@
<title>Bootstrap Plugin Test Suite</title>

<!-- jQuery -->
<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/jquery/dist/jquery.slim.min.js"></script>
<script src="../../node_modules/popper.js/dist/umd/popper.min.js"></script>

<!-- QUnit -->
Expand Down
9 changes: 3 additions & 6 deletions js/tests/karma.conf.js
View file
Open in desktop
Expand Up @@ -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'

Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/alert.html
View file
Open in desktop
Expand Up @@ -51,7 +51,7 @@ <h1>Alert <small>Bootstrap Visual Test</small></h1>
</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/alert.js"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/button.html
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@ <h1>Button <small>Bootstrap Visual Test</small></h1>
</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/button.js"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/carousel.html
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@ <h1>Carousel <small>Bootstrap Visual Test</small></h1>
</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/carousel.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/collapse.html
View file
Open in desktop
Expand Up @@ -71,7 +71,7 @@ <h5 class="mb-0">
</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/collapse.js"></script>
</body>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/dropdown.html
View file
Open in desktop
Expand Up @@ -203,7 +203,7 @@ <h1>Dropdown <small>Bootstrap Visual Test</small></h1>

</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="../../dist/util.js"></script>
<script src="../../dist/dropdown.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/modal.html
View file
Open in desktop
Expand Up @@ -205,7 +205,7 @@ <h4 class="modal-title" id="slowModalLabel">Lorem slowly</h4>
</button>
</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="../../dist/util.js"></script>
<script src="../../dist/modal.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/popover.html
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ <h1>Popover <small>Bootstrap Visual Test</small></h1>
</button>
</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="../../dist/util.js"></script>
<script src="../../dist/tooltip.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/scrollspy.html
View file
Open in desktop
Expand Up @@ -86,7 +86,7 @@ <h2 id="final">Final section</h2>
<p>Ad leggings keytar, brunch id art party dolor labore.</p>
</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/scrollspy.js"></script>
<script src="../../dist/dropdown.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/tab.html
View file
Open in desktop
Expand Up @@ -225,7 +225,7 @@ <h4>Tabs with list-group (with fade)</h4>
</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="../../dist/util.js"></script>
<script src="../../dist/tab.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/toast.html
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ <h1>Toast <small>Bootstrap Visual Test</small></h1>
</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/toast.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion js/tests/visual/tooltip.html
View file
Open in desktop
Expand Up @@ -71,7 +71,7 @@ <h1>Tooltip <small>Bootstrap Visual Test</small></h1>
<div id="customContainer"></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="../../dist/util.js"></script>
<script src="../../dist/tooltip.js"></script>
Expand Down