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 @@ Bootstrap Plugin Test Suite - + 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 @@ - + 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 @@ - + 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 @@ - + + 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 @@ - + 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 @@ - + 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 @@ - + 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 @@

Ad leggings keytar, brunch id art party dolor labore.

- + 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 @@ - + 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 @@ - + +