tests: minor cleanup (#35138)

* tests: minor cleanup

* tests: use the util noop function

diff --git a/js/tests/unit/alert.spec.js b/js/tests/unit/alert.spec.js
index 72cd23d89e79ee3b7b6d239d6da294e562645410..cdda997c90c80c9f9e477c335939a439fd809692 100644 (file)
--- a/js/tests/unit/alert.spec.js
+++ b/js/tests/unit/alert.spec.js
@@ -1,7 +1,5 @@
 import Alert from '../../src/alert'
 import { getTransitionDurationFromElement } from '../../src/util/index'
-
-/** Test helpers */
 import { clearFixture, getFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Alert', () => {

diff --git a/js/tests/unit/button.spec.js b/js/tests/unit/button.spec.js
index be99177e87301a07aceae1b1f60f2efeaa4add2c..e24ff5cb0f362372b2106605239e9d3dbb04bee8 100644 (file)
--- a/js/tests/unit/button.spec.js
+++ b/js/tests/unit/button.spec.js
@@ -1,11 +1,5 @@
 import Button from '../../src/button'
-
-/** Test helpers */
-import {
-  getFixture,
-  clearFixture,
-  jQueryMock
-} from '../helpers/fixture'
+import { getFixture, clearFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Button', () => {
   let fixtureEl

diff --git a/js/tests/unit/carousel.spec.js b/js/tests/unit/carousel.spec.js
index 9e5cfea8623fecbec9f2b340508a4fc57002497c..70b9b8f0f561ca3590ca3c93dfeccb403c2fd5dc 100644 (file)
--- a/js/tests/unit/carousel.spec.js
+++ b/js/tests/unit/carousel.spec.js
@@ -1,9 +1,7 @@
 import Carousel from '../../src/carousel'
 import EventHandler from '../../src/dom/event-handler'
-
-/** Test helpers */
 import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture'
-import * as util from '../../src/util'
+import { isRTL, noop } from '../../src/util/index'
 
 describe('Carousel', () => {
   const { Simulator, PointerEvent } = window
@@ -331,7 +329,7 @@ describe('Carousel', () => {
 
       // Headless browser does not support touch events, so need to fake it
       // to test that touch events are add properly.
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
       const carousel = new Carousel(carouselEl)
 
       expect(carousel._addTouchEventListeners).toHaveBeenCalled()
@@ -344,7 +342,7 @@ describe('Carousel', () => {
         return
       }
 
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
       document.head.append(stylesCarousel)
       Simulator.setType('pointer')
 
@@ -389,7 +387,7 @@ describe('Carousel', () => {
         return
       }
 
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
       document.head.append(stylesCarousel)
       Simulator.setType('pointer')
 
@@ -431,7 +429,7 @@ describe('Carousel', () => {
     it('should allow swiperight and call _slide (prev) with touch events', done => {
       Simulator.setType('touch')
       clearPointerEvents()
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
 
       fixtureEl.innerHTML = [
         '<div class="carousel" data-bs-interval="false">',
@@ -470,7 +468,7 @@ describe('Carousel', () => {
     it('should allow swipeleft and call _slide (next) with touch events', done => {
       Simulator.setType('touch')
       clearPointerEvents()
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
 
       fixtureEl.innerHTML = [
         '<div class="carousel" data-bs-interval="false">',
@@ -510,7 +508,7 @@ describe('Carousel', () => {
     it('should not slide when swiping and carousel is sliding', done => {
       Simulator.setType('touch')
       clearPointerEvents()
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
 
       fixtureEl.innerHTML = [
         '<div class="carousel" data-bs-interval="false">',
@@ -553,7 +551,7 @@ describe('Carousel', () => {
     it('should not allow pinch with touch events', done => {
       Simulator.setType('touch')
       clearPointerEvents()
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
 
       fixtureEl.innerHTML = '<div class="carousel" data-bs-interval="false"></div>'
 
@@ -978,7 +976,7 @@ describe('Carousel', () => {
       const carouselEl = fixtureEl.querySelector('#myCarousel')
       const carousel = new Carousel(carouselEl)
 
-      carousel._interval = setInterval(() => {}, 10)
+      carousel._interval = setInterval(noop, 10)
 
       spyOn(window, 'setInterval').and.callThrough()
       spyOn(window, 'clearInterval').and.callThrough()
@@ -1175,7 +1173,7 @@ describe('Carousel', () => {
 
       const carouselEl = fixtureEl.querySelector('div')
       const carousel = new Carousel(carouselEl, {})
-      expect(util.isRTL()).toEqual(true, 'rtl has to be true')
+      expect(isRTL()).toEqual(true, 'rtl has to be true')
 
       expect(carousel._directionToOrder('left')).toEqual('prev')
       expect(carousel._directionToOrder('prev')).toEqual('prev')
@@ -1243,7 +1241,7 @@ describe('Carousel', () => {
 
       // Headless browser does not support touch events, so need to fake it
       // to test that touch events are add/removed properly.
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
 
       const carousel = new Carousel(carouselEl)
 

diff --git a/js/tests/unit/collapse.spec.js b/js/tests/unit/collapse.spec.js
index da709bb85dd3ad4b53f3d5788346cfa0e73e49b9..89d20a6d870df3d47d22d52c98adbd1845cb4ebe 100644 (file)
--- a/js/tests/unit/collapse.spec.js
+++ b/js/tests/unit/collapse.spec.js
@@ -1,7 +1,5 @@
 import Collapse from '../../src/collapse'
 import EventHandler from '../../src/dom/event-handler'
-
-/** Test helpers */
 import { clearFixture, getFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Collapse', () => {

diff --git a/js/tests/unit/dom/data.spec.js b/js/tests/unit/dom/data.spec.js
index a00d3b7341e9ebb1abb1dc15e01677bdaf443854..2560caff7556105fe006c536079b42f16616a71a 100644 (file)
--- a/js/tests/unit/dom/data.spec.js
+++ b/js/tests/unit/dom/data.spec.js
@@ -1,6 +1,4 @@
 import Data from '../../../src/dom/data'
-
-/** Test helpers */
 import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('Data', () => {
@@ -90,8 +88,8 @@ describe('Data', () => {
     expect(Data.get(div, TEST_KEY)).toBeNull()
   })
 
+  /* eslint-disable no-console */
   it('should console.error a message if called with multiple keys', () => {
-    /* eslint-disable no-console */
     console.error = jasmine.createSpy('console.error')
 
     const data = { ...TEST_DATA }
@@ -103,4 +101,5 @@ describe('Data', () => {
     expect(console.error).toHaveBeenCalled()
     expect(Data.get(div, UNKNOWN_KEY)).toBe(null)
   })
+  /* eslint-enable no-console */
 })

diff --git a/js/tests/unit/dom/event-handler.spec.js b/js/tests/unit/dom/event-handler.spec.js
index 45f2d6e5537fec52eb8487e2558094507cff20c3..19d63492b58a860e4c41fe79ba084b295e24ccec 100644 (file)
--- a/js/tests/unit/dom/event-handler.spec.js
+++ b/js/tests/unit/dom/event-handler.spec.js
@@ -1,6 +1,4 @@
 import EventHandler from '../../../src/dom/event-handler'
-
-/** Test helpers */
 import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('EventHandler', () => {

diff --git a/js/tests/unit/dom/manipulator.spec.js b/js/tests/unit/dom/manipulator.spec.js
index 13d0c3d17d2fdb2def13f5058276b3b0d0ee55b6..61ffe74553cfc0137a70a5de100f6e96a9c3aaf6 100644 (file)
--- a/js/tests/unit/dom/manipulator.spec.js
+++ b/js/tests/unit/dom/manipulator.spec.js
@@ -1,6 +1,4 @@
 import Manipulator from '../../../src/dom/manipulator'
-
-/** Test helpers */
 import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('Manipulator', () => {

diff --git a/js/tests/unit/dom/selector-engine.spec.js b/js/tests/unit/dom/selector-engine.spec.js
index 08c3ae81844c7efbb3e31c3054c6a7b1f696ca5e..09c85a88ad6c7fd40d2edf65e940a7bd3853ecbc 100644 (file)
--- a/js/tests/unit/dom/selector-engine.spec.js
+++ b/js/tests/unit/dom/selector-engine.spec.js
@@ -1,6 +1,4 @@
 import SelectorEngine from '../../../src/dom/selector-engine'
-
-/** Test helpers */
 import { getFixture, clearFixture } from '../../helpers/fixture'
 
 describe('SelectorEngine', () => {

diff --git a/js/tests/unit/dropdown.spec.js b/js/tests/unit/dropdown.spec.js
index a3c60ff65b1cb10f1905d5552d8e96bf1ef426d7..f099e99908d3aa2c7c3a7c5b0b2d5302556015c3 100644 (file)
--- a/js/tests/unit/dropdown.spec.js
+++ b/js/tests/unit/dropdown.spec.js
@@ -1,8 +1,6 @@
 import Dropdown from '../../src/dropdown'
 import EventHandler from '../../src/dom/event-handler'
-import { noop } from '../../src/util'
-
-/** Test helpers */
+import { noop } from '../../src/util/index'
 import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Dropdown', () => {
@@ -225,7 +223,7 @@ describe('Dropdown', () => {
       const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
       const dropdown = new Dropdown(btnDropdown)
 
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
       spyOn(EventHandler, 'on')
       spyOn(EventHandler, 'off')
 
@@ -891,7 +889,7 @@ describe('Dropdown', () => {
       const btnDropdown = fixtureEl.querySelector('[data-bs-toggle="dropdown"]')
       const dropdown = new Dropdown(btnDropdown)
 
-      document.documentElement.ontouchstart = () => {}
+      document.documentElement.ontouchstart = noop
       spyOn(EventHandler, 'off')
 
       btnDropdown.addEventListener('shown.bs.dropdown', () => {

diff --git a/js/tests/unit/jquery.spec.js b/js/tests/unit/jquery.spec.js
index 7513341a43688871278f3aebd4a345acb41dce4d..1c9258bd1160d5a83f04a30f3354d325f6cc7742 100644 (file)
--- a/js/tests/unit/jquery.spec.js
+++ b/js/tests/unit/jquery.spec.js
@@ -1,4 +1,5 @@
 /* eslint-env jquery */
+
 import Alert from '../../src/alert'
 import Button from '../../src/button'
 import Carousel from '../../src/carousel'
@@ -11,8 +12,6 @@ import ScrollSpy from '../../src/scrollspy'
 import Tab from '../../src/tab'
 import Toast from '../../src/toast'
 import Tooltip from '../../src/tooltip'
-
-/** Test helpers */
 import { getFixture, clearFixture } from '../helpers/fixture'
 
 describe('jQuery', () => {

diff --git a/js/tests/unit/modal.spec.js b/js/tests/unit/modal.spec.js
index 211c7140ff186d31d14e4c01f2b88a7892e18521..a5308eb2b20f2d36fb675835a9b546011ed4e2e3 100644 (file)
--- a/js/tests/unit/modal.spec.js
+++ b/js/tests/unit/modal.spec.js
@@ -1,8 +1,6 @@
 import Modal from '../../src/modal'
 import EventHandler from '../../src/dom/event-handler'
 import ScrollBarHelper from '../../src/util/scrollbar'
-
-/** Test helpers */
 import { clearBodyAndDocument, clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Modal', () => {

diff --git a/js/tests/unit/offcanvas.spec.js b/js/tests/unit/offcanvas.spec.js
index 877d2e7f3715d8a94436afab74b5733eef200e89..3eda505202de19dacb5848d846a37b511b9bada0 100644 (file)
--- a/js/tests/unit/offcanvas.spec.js
+++ b/js/tests/unit/offcanvas.spec.js
@@ -1,9 +1,7 @@
 import Offcanvas from '../../src/offcanvas'
 import EventHandler from '../../src/dom/event-handler'
-
-/** Test helpers */
 import { clearBodyAndDocument, clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture'
-import { isVisible } from '../../src/util'
+import { isVisible } from '../../src/util/index'
 import ScrollBarHelper from '../../src/util/scrollbar'
 
 describe('Offcanvas', () => {

diff --git a/js/tests/unit/popover.spec.js b/js/tests/unit/popover.spec.js
index c068e2fab331f71de03dcbca6edb341fcc0a3c7c..4452a132d4d7d285369baa5ca3d344035b07c453 100644 (file)
--- a/js/tests/unit/popover.spec.js
+++ b/js/tests/unit/popover.spec.js
@@ -1,6 +1,4 @@
 import Popover from '../../src/popover'
-
-/** Test helpers */
 import { clearFixture, getFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Popover', () => {

diff --git a/js/tests/unit/scrollspy.spec.js b/js/tests/unit/scrollspy.spec.js
index ad44d5b3c4669414c0b847444fc11fe0efaa840f..f64b8f1dc945ed5d9289af6af17a09804ca7ce09 100644 (file)
--- a/js/tests/unit/scrollspy.spec.js
+++ b/js/tests/unit/scrollspy.spec.js
@@ -1,7 +1,5 @@
 import ScrollSpy from '../../src/scrollspy'
 import Manipulator from '../../src/dom/manipulator'
-
-/** Test helpers */
 import { getFixture, clearFixture, createEvent, jQueryMock } from '../helpers/fixture'
 
 describe('ScrollSpy', () => {

diff --git a/js/tests/unit/tab.spec.js b/js/tests/unit/tab.spec.js
index 4bd9c7a73343a30b2728baaaba8b43205f216b4c..05f9db2ec174a651b76ed039f53b74bd7ca6ccba 100644 (file)
--- a/js/tests/unit/tab.spec.js
+++ b/js/tests/unit/tab.spec.js
@@ -1,6 +1,4 @@
 import Tab from '../../src/tab'
-
-/** Test helpers */
 import { getFixture, clearFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Tab', () => {

diff --git a/js/tests/unit/toast.spec.js b/js/tests/unit/toast.spec.js
index c491650b1cf463ae8c2c6cc9788933bd5e2a1318..4b84bf2c5ca4c4db54931b8af7913a5f4e7f45ab 100644 (file)
--- a/js/tests/unit/toast.spec.js
+++ b/js/tests/unit/toast.spec.js
@@ -1,6 +1,4 @@
 import Toast from '../../src/toast'
-
-/** Test helpers */
 import { getFixture, clearFixture, createEvent, jQueryMock } from '../helpers/fixture'
 
 describe('Toast', () => {

diff --git a/js/tests/unit/tooltip.spec.js b/js/tests/unit/tooltip.spec.js
index 01ab1b149d5772497e283a155fbe91be8ffd203a..0cca4acff853da0cbccb05a47ccbd06bfb98379e 100644 (file)
--- a/js/tests/unit/tooltip.spec.js
+++ b/js/tests/unit/tooltip.spec.js
@@ -1,8 +1,6 @@
 import Tooltip from '../../src/tooltip'
 import EventHandler from '../../src/dom/event-handler'
 import { noop } from '../../src/util/index'
-
-/** Test helpers */
 import { clearFixture, createEvent, getFixture, jQueryMock } from '../helpers/fixture'
 
 describe('Tooltip', () => {

diff --git a/js/tests/unit/util/index.spec.js b/js/tests/unit/util/index.spec.js
index 38e94dc6bb940ef64f012ed3bafa1dbccf1d6902..ccfe5e2c298f6445727401b560b3893e22fe68b1 100644 (file)
--- a/js/tests/unit/util/index.spec.js
+++ b/js/tests/unit/util/index.spec.js
@@ -1,6 +1,4 @@
 import * as Util from '../../../src/util/index'
-
-/** Test helpers */
 import { clearFixture, getFixture } from '../../helpers/fixture'
 
 describe('Util', () => {