From 3aeda9942dc1743e982b2b6bfeee2e1cfbca2ec5 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 15 Jan 2019 18:01:40 +0200
Subject: [PATCH] tests: use jQuery from node_modules. (#28059)
---
js/tests/index.html | 14 +-------------
js/tests/karma.conf.js | 9 +++------
js/tests/visual/alert.html | 2 +-
js/tests/visual/button.html | 2 +-
js/tests/visual/carousel.html | 2 +-
js/tests/visual/collapse.html | 2 +-
js/tests/visual/dropdown.html | 2 +-
js/tests/visual/modal.html | 2 +-
js/tests/visual/popover.html | 2 +-
js/tests/visual/scrollspy.html | 2 +-
js/tests/visual/tab.html | 2 +-
js/tests/visual/toast.html | 2 +-
js/tests/visual/tooltip.html | 2 +-
13 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/js/tests/index.html b/js/tests/index.html
index 37c1c2b272..99acd4ad4e 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -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 -->
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index 06046ca8e4..a6c6905985 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,
diff --git a/js/tests/visual/alert.html b/js/tests/visual/alert.html
index 7cb48b3468..6eb7e9444c 100644
--- a/js/tests/visual/alert.html
+++ b/js/tests/visual/alert.html
@@ -51,7 +51,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="../../dist/util.js"></script>
<script src="../../dist/alert.js"></script>
</body>
diff --git a/js/tests/visual/button.html b/js/tests/visual/button.html
index 85555b855b..b7ba7964d4 100644
--- a/js/tests/visual/button.html
+++ b/js/tests/visual/button.html
@@ -44,7 +44,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="../../dist/util.js"></script>
<script src="../../dist/button.js"></script>
</body>
diff --git a/js/tests/visual/carousel.html b/js/tests/visual/carousel.html
index 7b2cb747c9..1907acf80c 100644
--- a/js/tests/visual/carousel.html
+++ b/js/tests/visual/carousel.html
@@ -45,7 +45,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="../../dist/util.js"></script>
<script src="../../dist/carousel.js"></script>
<script>
diff --git a/js/tests/visual/collapse.html b/js/tests/visual/collapse.html
index 6ea3b18d99..4d449a4262 100644
--- a/js/tests/visual/collapse.html
+++ b/js/tests/visual/collapse.html
@@ -71,7 +71,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="../../dist/util.js"></script>
<script src="../../dist/collapse.js"></script>
</body>
diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index ea3289db5e..e8dd3520de 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -203,7 +203,7 @@
</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>
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index e2cf656df6..1d3cd484b5 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -205,7 +205,7 @@
</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>
diff --git a/js/tests/visual/popover.html b/js/tests/visual/popover.html
index 0a5dc677f6..d5c7cf205f 100644
--- a/js/tests/visual/popover.html
+++ b/js/tests/visual/popover.html
@@ -31,7 +31,7 @@
</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>
diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html
index 8340f41306..b9f36c496d 100644
--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
@@ -86,7 +86,7 @@
<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>
diff --git a/js/tests/visual/tab.html b/js/tests/visual/tab.html
index 60582c1c52..4fdab29b77 100644
--- a/js/tests/visual/tab.html
+++ b/js/tests/visual/tab.html
@@ -225,7 +225,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="../../dist/util.js"></script>
<script src="../../dist/tab.js"></script>
diff --git a/js/tests/visual/toast.html b/js/tests/visual/toast.html
index 6becd5669a..06fa73d92d 100644
--- a/js/tests/visual/toast.html
+++ b/js/tests/visual/toast.html
@@ -52,7 +52,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="../../dist/util.js"></script>
<script src="../../dist/toast.js"></script>
<script>
diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html
index 3f56a5c86a..c340ae274d 100644
--- a/js/tests/visual/tooltip.html
+++ b/js/tests/visual/tooltip.html
@@ -71,7 +71,7 @@
<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>
--
GitLab