Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
3aeda994
Unverified
Commit
3aeda994
authored
6 years ago
by
XhmikosR
Committed by
GitHub
6 years ago
Browse files
Options
Download
Email Patches
Plain Diff
tests: use jQuery from node_modules. (#28059)
parent
0828b885
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
js/tests/index.html
+1
-13
js/tests/index.html
js/tests/karma.conf.js
+3
-6
js/tests/karma.conf.js
js/tests/visual/alert.html
+1
-1
js/tests/visual/alert.html
js/tests/visual/button.html
+1
-1
js/tests/visual/button.html
js/tests/visual/carousel.html
+1
-1
js/tests/visual/carousel.html
js/tests/visual/collapse.html
+1
-1
js/tests/visual/collapse.html
js/tests/visual/dropdown.html
+1
-1
js/tests/visual/dropdown.html
js/tests/visual/modal.html
+1
-1
js/tests/visual/modal.html
js/tests/visual/popover.html
+1
-1
js/tests/visual/popover.html
js/tests/visual/scrollspy.html
+1
-1
js/tests/visual/scrollspy.html
js/tests/visual/tab.html
+1
-1
js/tests/visual/tab.html
js/tests/visual/toast.html
+1
-1
js/tests/visual/toast.html
js/tests/visual/tooltip.html
+1
-1
js/tests/visual/tooltip.html
with
15 additions
and
30 deletions
+15
-30
js/tests/index.html
+
1
-
13
View file @
3aeda994
...
...
@@ -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 -->
...
...
This diff is collapsed.
Click to expand it.
js/tests/karma.conf.js
+
3
-
6
View file @
3aeda994
...
...
@@ -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
:
jsC
overage
Path
,
dir
:
'
../c
overage
/
'
,
reports
:
[
'
lcov
'
,
'
text-summary
'
],
thresholds
:
{
emitWarning
:
false
,
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/alert.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/button.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/carousel.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/collapse.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/dropdown.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/modal.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/popover.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/scrollspy.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/tab.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/toast.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
js/tests/visual/tooltip.html
+
1
-
1
View file @
3aeda994
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets