Merge branch 'twbs:main' into mainHEADmain

1 files changed, 19 insertions, 21 deletions

diff --git a/js/tests/unit/util/component-functions.spec.js b/js/tests/unit/util/component-functions.spec.js
index edaedd32e..ce83785e2 100644
--- a/js/tests/unit/util/component-functions.spec.js
+++ b/js/tests/unit/util/component-functions.spec.js
@@ -1,8 +1,6 @@
-/* Test helpers */
-
-import { clearFixture, createEvent, getFixture } from '../../helpers/fixture'
-import { enableDismissTrigger } from '../../../src/util/component-functions'
-import BaseComponent from '../../../src/base-component'
+import BaseComponent from '../../../src/base-component.js'
+import { enableDismissTrigger } from '../../../src/util/component-functions.js'
+import { clearFixture, createEvent, getFixture } from '../../helpers/fixture.js'
 
 class DummyClass2 extends BaseComponent {
   static get NAME() {
@@ -33,12 +31,12 @@ describe('Plugin functions', () => {
     it('should get Plugin and execute the given method, when a click occurred on data-bs-dismiss="PluginName"', () => {
       fixtureEl.innerHTML = [
         '<div id="foo" class="test">',
-        '      <button type="button" data-bs-dismiss="test" data-bs-target="#foo"></button>',
+        '  <button type="button" data-bs-dismiss="test" data-bs-target="#foo"></button>',
         '</div>'
       ].join('')
 
-      spyOn(DummyClass2, 'getOrCreateInstance').and.callThrough()
-      spyOn(DummyClass2.prototype, 'testMethod')
+      const spyGet = spyOn(DummyClass2, 'getOrCreateInstance').and.callThrough()
+      const spyTest = spyOn(DummyClass2.prototype, 'testMethod')
       const componentWrapper = fixtureEl.querySelector('#foo')
       const btnClose = fixtureEl.querySelector('[data-bs-dismiss="test"]')
       const event = createEvent('click')
@@ -46,19 +44,19 @@ describe('Plugin functions', () => {
       enableDismissTrigger(DummyClass2, 'testMethod')
       btnClose.dispatchEvent(event)
 
-      expect(DummyClass2.getOrCreateInstance).toHaveBeenCalledWith(componentWrapper)
-      expect(DummyClass2.prototype.testMethod).toHaveBeenCalled()
+      expect(spyGet).toHaveBeenCalledWith(componentWrapper)
+      expect(spyTest).toHaveBeenCalled()
     })
 
     it('if data-bs-dismiss="PluginName" hasn\'t got "data-bs-target", "getOrCreateInstance" has to be initialized by closest "plugin.Name" class', () => {
       fixtureEl.innerHTML = [
         '<div id="foo" class="test">',
-        '   <button type="button" data-bs-dismiss="test"></button>',
+        '  <button type="button" data-bs-dismiss="test"></button>',
         '</div>'
       ].join('')
 
-      spyOn(DummyClass2, 'getOrCreateInstance').and.callThrough()
-      spyOn(DummyClass2.prototype, 'hide')
+      const spyGet = spyOn(DummyClass2, 'getOrCreateInstance').and.callThrough()
+      const spyHide = spyOn(DummyClass2.prototype, 'hide')
       const componentWrapper = fixtureEl.querySelector('#foo')
       const btnClose = fixtureEl.querySelector('[data-bs-dismiss="test"]')
       const event = createEvent('click')
@@ -66,31 +64,31 @@ describe('Plugin functions', () => {
       enableDismissTrigger(DummyClass2)
       btnClose.dispatchEvent(event)
 
-      expect(DummyClass2.getOrCreateInstance).toHaveBeenCalledWith(componentWrapper)
-      expect(DummyClass2.prototype.hide).toHaveBeenCalled()
+      expect(spyGet).toHaveBeenCalledWith(componentWrapper)
+      expect(spyHide).toHaveBeenCalled()
     })
 
     it('if data-bs-dismiss="PluginName" is disabled, must not trigger function', () => {
       fixtureEl.innerHTML = [
         '<div id="foo" class="test">',
-        '   <button type="button" disabled data-bs-dismiss="test"></button>',
+        '  <button type="button" disabled data-bs-dismiss="test"></button>',
         '</div>'
       ].join('')
 
-      spyOn(DummyClass2, 'getOrCreateInstance').and.callThrough()
+      const spy = spyOn(DummyClass2, 'getOrCreateInstance').and.callThrough()
       const btnClose = fixtureEl.querySelector('[data-bs-dismiss="test"]')
       const event = createEvent('click')
 
       enableDismissTrigger(DummyClass2)
       btnClose.dispatchEvent(event)
 
-      expect(DummyClass2.getOrCreateInstance).not.toHaveBeenCalled()
+      expect(spy).not.toHaveBeenCalled()
     })
 
     it('should prevent default when the trigger is <a> or <area>', () => {
       fixtureEl.innerHTML = [
         '<div id="foo" class="test">',
-        '      <a type="button" data-bs-dismiss="test"></a>',
+        '  <a type="button" data-bs-dismiss="test"></a>',
         '</div>'
       ].join('')
 
@@ -98,11 +96,11 @@ describe('Plugin functions', () => {
       const event = createEvent('click')
 
       enableDismissTrigger(DummyClass2)
-      spyOn(Event.prototype, 'preventDefault').and.callThrough()
+      const spy = spyOn(Event.prototype, 'preventDefault').and.callThrough()
 
       btnClose.dispatchEvent(event)
 
-      expect(Event.prototype.preventDefault).toHaveBeenCalled()
+      expect(spy).toHaveBeenCalled()
     })
   })
 })