tests: use jQuery from node_modules. (#28059)

diff --git a/js/tests/index.html b/js/tests/index.html
index 37c1c2b27285a85fdddfd70a5e1090d5616517ac..99acd4ad4ee7bfc75e127dd65e7ff2c9ed5c38d7 100644 (file)
--- 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 06046ca8e439e2d78fbf0ff5ec3453c3f5a85bfc..a6c6905985a5b2f3e74674752604396ef68bd6b1 100644 (file)
--- 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 7cb48b3468afe8d9699ba4a978458cf89253aef6..6eb7e9444c291a7f527a0b73b642b4911ab01336 100644 (file)
--- 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 85555b855bd5fe09c1769ee15088f3a638c907b4..b7ba7964d404a32feb5b1721e4c70736a796e8e6 100644 (file)
--- 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 7b2cb747c9209dda7328ac8d7a367689ad722602..1907acf80c918c6742746e315293990c2db6e70b 100644 (file)
--- 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 6ea3b18d99ab038b36674848d3b8d5d5af76333e..4d449a426256a28972f05a2e28666761332d937b 100644 (file)
--- 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 ea3289db5ef8536bb81c0a967c6d9c6fc822150d..e8dd3520ded744d40884bd70a59eaaae7bb01176 100644 (file)
--- 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 e2cf656df663886ab9ba7872498e6c0ad4afafea..1d3cd484b54f6df4a053f4a749a9b5baf774c658 100644 (file)
--- 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 0a5dc677f61eee8bf08607bbeec3bddacbc7d6ee..d5c7cf205f321a9749d766dcaf46898025f72829 100644 (file)
--- 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 8340f41306cd614efbface461130ce3c7a0ba242..b9f36c496d695ae6b77cd3229f6a1a511421b678 100644 (file)
--- 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 60582c1c52aff704a3193173df462dbddf23c1da..4fdab29b77552ddf85b8994f641eaaf2458efb28 100644 (file)
--- 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 6becd5669a44e24d3e554bb4001dd24072a4656c..06fa73d92d011e4b598bb5ca8eb4a2657f0466d7 100644 (file)
--- 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 3f56a5c86adc4799f0e10d659569d2008c943867..c340ae274ddc7c4c75cc47430294180a45836fd7 100644 (file)
--- 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>