aboutsummaryrefslogtreecommitdiff
path: root/js/tests
diff options
context:
space:
mode:
authorPriyansh <[email protected]>2021-10-06 14:40:59 -0400
committerGitHub <[email protected]>2021-10-06 14:40:59 -0400
commit52cd86f8710f8049a744b5bcb9f4a7ce19114b6e (patch)
tree8956dbd6f94ae25d273d496e64840ed30b6d88a5 /js/tests
parentd065706ce4b439b5c77d9a68e708212e91cc4f0b (diff)
parentc331a150cdc2834f08bcf458cdb1b104cc510b67 (diff)
downloadbootstrap-52cd86f8710f8049a744b5bcb9f4a7ce19114b6e.tar.xz
bootstrap-52cd86f8710f8049a744b5bcb9f4a7ce19114b6e.zip
Merge branch 'twbs:main' into main
Diffstat (limited to 'js/tests')
-rw-r--r--js/tests/helpers/fixture.js8
-rw-r--r--js/tests/karma.conf.js3
-rw-r--r--js/tests/unit/carousel.spec.js6
-rw-r--r--js/tests/unit/modal.spec.js7
-rw-r--r--js/tests/unit/popover.spec.js4
-rw-r--r--js/tests/unit/tooltip.spec.js4
-rw-r--r--js/tests/unit/util/backdrop.spec.js14
-rw-r--r--js/tests/visual/modal.html17
-rw-r--r--js/tests/visual/popover.html8
-rw-r--r--js/tests/visual/toast.html36
-rw-r--r--js/tests/visual/tooltip.html8
11 files changed, 58 insertions, 57 deletions
diff --git a/js/tests/helpers/fixture.js b/js/tests/helpers/fixture.js
index 29fa91896..02915af44 100644
--- a/js/tests/helpers/fixture.js
+++ b/js/tests/helpers/fixture.js
@@ -34,17 +34,17 @@ export const jQueryMock = {
elements: undefined,
fn: {},
each(fn) {
- this.elements.forEach(el => {
+ for (const el of this.elements) {
fn.call(el)
- })
+ }
}
}
export const clearBodyAndDocument = () => {
const attributes = ['data-bs-padding-right', 'style']
- attributes.forEach(attr => {
+ for (const attr of attributes) {
document.documentElement.removeAttribute(attr)
document.body.removeAttribute(attr)
- })
+ }
}
diff --git a/js/tests/karma.conf.js b/js/tests/karma.conf.js
index 1d4b0d3e4..d85f2441c 100644
--- a/js/tests/karma.conf.js
+++ b/js/tests/karma.conf.js
@@ -98,7 +98,8 @@ const conf = {
output: {
format: 'iife',
name: 'bootstrapTest',
- sourcemap: 'inline'
+ sourcemap: 'inline',
+ generatedCode: 'es2015'
}
}
}
diff --git a/js/tests/unit/carousel.spec.js b/js/tests/unit/carousel.spec.js
index 83ba28912..9e5cfea86 100644
--- a/js/tests/unit/carousel.spec.js
+++ b/js/tests/unit/carousel.spec.js
@@ -211,14 +211,14 @@ describe('Carousel', () => {
spyOn(carousel, '_triggerSlideEvent')
- carousel._isSliding = true;
+ carousel._isSliding = true
- ['ArrowLeft', 'ArrowRight'].forEach(key => {
+ for (const key of ['ArrowLeft', 'ArrowRight']) {
const keydown = createEvent('keydown')
keydown.key = key
carouselEl.dispatchEvent(keydown)
- })
+ }
expect(carousel._triggerSlideEvent).not.toHaveBeenCalled()
})
diff --git a/js/tests/unit/modal.spec.js b/js/tests/unit/modal.spec.js
index 9632fa6cf..211c7140f 100644
--- a/js/tests/unit/modal.spec.js
+++ b/js/tests/unit/modal.spec.js
@@ -17,10 +17,9 @@ describe('Modal', () => {
clearBodyAndDocument()
document.body.classList.remove('modal-open')
- document.querySelectorAll('.modal-backdrop')
- .forEach(backdrop => {
- backdrop.remove()
- })
+ for (const backdrop of document.querySelectorAll('.modal-backdrop')) {
+ backdrop.remove()
+ }
})
beforeEach(() => {
diff --git a/js/tests/unit/popover.spec.js b/js/tests/unit/popover.spec.js
index c54fc49ee..c068e2fab 100644
--- a/js/tests/unit/popover.spec.js
+++ b/js/tests/unit/popover.spec.js
@@ -15,9 +15,9 @@ describe('Popover', () => {
const popoverList = document.querySelectorAll('.popover')
- popoverList.forEach(popoverEl => {
+ for (const popoverEl of popoverList) {
popoverEl.remove()
- })
+ }
})
describe('VERSION', () => {
diff --git a/js/tests/unit/tooltip.spec.js b/js/tests/unit/tooltip.spec.js
index 22a7edd01..01ab1b149 100644
--- a/js/tests/unit/tooltip.spec.js
+++ b/js/tests/unit/tooltip.spec.js
@@ -15,9 +15,9 @@ describe('Tooltip', () => {
afterEach(() => {
clearFixture()
- document.querySelectorAll('.tooltip').forEach(tooltipEl => {
+ for (const tooltipEl of document.querySelectorAll('.tooltip')) {
tooltipEl.remove()
- })
+ }
})
describe('VERSION', () => {
diff --git a/js/tests/unit/util/backdrop.spec.js b/js/tests/unit/util/backdrop.spec.js
index b885b60b5..818ddf221 100644
--- a/js/tests/unit/util/backdrop.spec.js
+++ b/js/tests/unit/util/backdrop.spec.js
@@ -17,9 +17,9 @@ describe('Backdrop', () => {
clearFixture()
const list = document.querySelectorAll(CLASS_BACKDROP)
- list.forEach(el => {
+ for (const el of list) {
el.remove()
- })
+ }
})
describe('show', () => {
@@ -35,9 +35,10 @@ describe('Backdrop', () => {
instance.show()
instance.show(() => {
expect(getElements().length).toEqual(1)
- getElements().forEach(el => {
+ for (const el of getElements()) {
expect(el.classList.contains(CLASS_NAME_SHOW)).toEqual(true)
- })
+ }
+
done()
})
})
@@ -67,9 +68,10 @@ describe('Backdrop', () => {
instance.show(() => {
expect(getElements().length).toEqual(1)
- getElements().forEach(el => {
+ for (const el of getElements()) {
expect(el.classList.contains(CLASS_NAME_FADE)).toEqual(true)
- })
+ }
+
done()
})
})
diff --git a/js/tests/visual/modal.html b/js/tests/visual/modal.html
index ac0a931af..719e9cc10 100644
--- a/js/tests/visual/modal.html
+++ b/js/tests/visual/modal.html
@@ -220,15 +220,14 @@
}
}
- [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'))
- .forEach(function (popover) {
- new Popover(popover)
- })
-
- var tooltipList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
- tooltipList.forEach(function (tooltip) {
- new Tooltip(tooltip)
- })
+ var popoverElements = document.querySelectorAll('[data-bs-toggle="popover"]')
+ for (const popoverEl of popoverElements) {
+ new Popover(popoverEl)
+ }
+ var tooltipElements = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+ for (const tooltipEl of tooltipElements) {
+ new Tooltip(tooltipEl)
+ }
var tallToggle = document.getElementById('tall-toggle')
var tall = document.getElementById('tall')
diff --git a/js/tests/visual/popover.html b/js/tests/visual/popover.html
index 986ac571e..3503271ae 100644
--- a/js/tests/visual/popover.html
+++ b/js/tests/visual/popover.html
@@ -40,10 +40,10 @@
<script src="../../dist/tooltip.js"></script>
<script src="../../dist/popover.js"></script>
<script>
- [].slice.call(document.querySelectorAll('[data-bs-toggle="popover"]'))
- .forEach(function (popover) {
- new Popover(popover)
- })
+ var popoverElements = document.querySelectorAll('[data-bs-toggle="popover"]')
+ for (const popoverEl of popoverElements) {
+ new Popover(popoverEl)
+ }
</script>
</body>
</html>
diff --git a/js/tests/visual/toast.html b/js/tests/visual/toast.html
index 3971a6075..f9e1741cf 100644
--- a/js/tests/visual/toast.html
+++ b/js/tests/visual/toast.html
@@ -57,26 +57,26 @@
<script src="../../dist/toast.js"></script>
<script>
window.addEventListener('load', function () {
- Array.from(document.querySelectorAll('.toast'))
- .forEach(function (toastNode) {
- new Toast(toastNode)
- })
+ var toastElements = document.querySelectorAll('.toast')
+ for (const toastEl of toastElements) {
+ new Toast(toastEl)
+ }
- document.getElementById('btnShowToast').addEventListener('click', function () {
- Array.from(document.querySelectorAll('.toast'))
- .forEach(function (toastNode) {
- var toast = Toast.getInstance(toastNode)
- toast.show()
- })
- })
+ document.getElementById('btnShowToast').addEventListener('click', function () {
+ var toastElements = document.querySelectorAll('.toast')
+ for (const toastEl of toastElements) {
+ var toast = Toast.getInstance(toastEl)
+ toast.show()
+ }
+ })
- document.getElementById('btnHideToast').addEventListener('click', function () {
- Array.from(document.querySelectorAll('.toast'))
- .forEach(function (toastNode) {
- var toast = Toast.getInstance(toastNode)
- toast.hide()
- })
- })
+ document.getElementById('btnHideToast').addEventListener('click', function () {
+ var toastElements = document.querySelectorAll('.toast')
+ for (const toastEl of toastElements) {
+ var toast = Toast.getInstance(toastEl)
+ toast.hide()
+ }
+ })
})
</script>
</body>
diff --git a/js/tests/visual/tooltip.html b/js/tests/visual/tooltip.html
index ab6040920..448841e58 100644
--- a/js/tests/visual/tooltip.html
+++ b/js/tests/visual/tooltip.html
@@ -92,10 +92,10 @@
})
}
- [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
- .forEach(function (tooltip) {
- new Tooltip(tooltip)
- })
+ var tooltipElements = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+ for (const tooltipEl of tooltipElements) {
+ new Tooltip(tooltipEl)
+ }
var tooltipElement = document.getElementById('tooltipElement')
var tooltipElementInstance = new Tooltip(tooltipElement, {