tests: try to fix a few random failures (#35184)

* Change `Swipe` dispose spy on EventHandler
* Modal hide spy on backdrop hide

diff --git a/js/tests/unit/carousel.spec.js b/js/tests/unit/carousel.spec.js
index b048f3a88240ef221057aab660c56c87f43167e6..a138f3ad55ef77748a67faa2234a3c43b0bca16b 100644 (file)
--- a/js/tests/unit/carousel.spec.js
+++ b/js/tests/unit/carousel.spec.js
@@ -1268,6 +1268,7 @@ describe('Carousel', () => {
 
       carousel.dispose()
 
+      expect(carousel._swipeHelper).toBeNull()
       expect(removeEventSpy).toHaveBeenCalledWith(carouselEl, Carousel.EVENT_KEY)
       expect(swipeHelperSpy).toHaveBeenCalled()
 

diff --git a/js/tests/unit/modal.spec.js b/js/tests/unit/modal.spec.js
index a5308eb2b20f2d36fb675835a9b546011ed4e2e3..6e7b8fc88ffb1fb92466ab8b0f75a3bc3c68f7b2 100644 (file)
--- a/js/tests/unit/modal.spec.js
+++ b/js/tests/unit/modal.spec.js
@@ -608,6 +608,7 @@ describe('Modal', () => {
 
       const modalEl = fixtureEl.querySelector('.modal')
       const modal = new Modal(modalEl)
+      const backdropSpy = spyOn(modal._backdrop, 'hide').and.callThrough()
 
       modalEl.addEventListener('shown.bs.modal', () => {
         modal.hide()
@@ -622,7 +623,7 @@ describe('Modal', () => {
         expect(modalEl.getAttribute('role')).toBeNull()
         expect(modalEl.getAttribute('aria-hidden')).toEqual('true')
         expect(modalEl.style.display).toEqual('none')
-        expect(document.querySelector('.modal-backdrop')).toBeNull()
+        expect(backdropSpy).toHaveBeenCalled()
         done()
       })
 

diff --git a/js/tests/unit/util/swipe.spec.js b/js/tests/unit/util/swipe.spec.js
index d6aeb17f6a82d46446e579a0e5f4e7199d5661f9..474e34f653f40c883a8aa5bc33fe4ab341750f94 100644 (file)
--- a/js/tests/unit/util/swipe.spec.js
+++ b/js/tests/unit/util/swipe.spec.js
@@ -232,7 +232,7 @@ describe('Swipe', () => {
 
     it('should destroy', () => {
       const addEventSpy = spyOn(fixtureEl, 'addEventListener').and.callThrough()
-      const removeEventSpy = spyOn(fixtureEl, 'removeEventListener').and.callThrough()
+      const removeEventSpy = spyOn(EventHandler, 'off').and.callThrough()
       defineDocumentElementOntouchstart()
 
       const swipe = new Swipe(fixtureEl)
@@ -253,9 +253,8 @@ describe('Swipe', () => {
 
       swipe.dispose()
 
-      expect(removeEventSpy.calls.allArgs()).toEqual(expectedArgs)
-
-      delete document.documentElement.ontouchstart
+      expect(removeEventSpy).toHaveBeenCalledWith(fixtureEl, '.bs.swipe')
+      deleteDocumentElementOntouchstart()
     })
   })