From c9f8fa45fb821d700c1f2e0eea8cf03a87a0ee70 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 2 Nov 2020 16:13:24 +0200 Subject: [PATCH] tests: tweak Jasmine usage (#32046) * jasmine/expect-matcher * jasmine/prefer-jasmine-matcher Found with `eslint-plugin-jasmine` --- js/tests/unit/dom/event-handler.spec.js | 10 +++++----- js/tests/unit/dom/manipulator.spec.js | 2 +- js/tests/unit/dropdown.spec.js | 4 ++-- js/tests/unit/modal.spec.js | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/js/tests/unit/dom/event-handler.spec.js b/js/tests/unit/dom/event-handler.spec.js index 5551ddaa3..e596a49b5 100644 --- a/js/tests/unit/dom/event-handler.spec.js +++ b/js/tests/unit/dom/event-handler.spec.js @@ -297,31 +297,31 @@ describe('EventHandler', () => { EventHandler.trigger(subelement, 'click') // first listeners called - expect(i === 2).toEqual(true) + expect(i).toEqual(2) EventHandler.off(element, 'click', 'span', handler) EventHandler.trigger(subelement, 'click') // removed listener not called - expect(i === 2).toEqual(true) + expect(i).toEqual(2) EventHandler.trigger(anchor, 'click') // not removed listener called - expect(i === 3).toEqual(true) + expect(i).toEqual(3) EventHandler.on(element, 'click', 'span', handler) EventHandler.trigger(anchor, 'click') EventHandler.trigger(subelement, 'click') // listener re-registered - expect(i === 5).toEqual(true) + expect(i).toEqual(5) EventHandler.off(element, 'click', 'span') EventHandler.trigger(subelement, 'click') // listener removed again - expect(i === 5).toEqual(true) + expect(i).toEqual(5) }) }) }) diff --git a/js/tests/unit/dom/manipulator.spec.js b/js/tests/unit/dom/manipulator.spec.js index 16750fd74..8d8118f2b 100644 --- a/js/tests/unit/dom/manipulator.spec.js +++ b/js/tests/unit/dom/manipulator.spec.js @@ -56,7 +56,7 @@ describe('Manipulator', () => { describe('getDataAttributes', () => { it('should return empty object for null', () => { - expect(Manipulator.getDataAttributes(null), {}) + expect(Manipulator.getDataAttributes(null)).toEqual({}) expect().nothing() }) diff --git a/js/tests/unit/dropdown.spec.js b/js/tests/unit/dropdown.spec.js index c7f05ed22..17a5b41cf 100644 --- a/js/tests/unit/dropdown.spec.js +++ b/js/tests/unit/dropdown.spec.js @@ -1320,8 +1320,8 @@ describe('Dropdown', () => { triggerDropdown.dispatchEvent(keydown) expect(document.activeElement.classList.contains('d-none')).toEqual(false, '.d-none not focused') - expect(document.activeElement.style.display === 'none').toEqual(false, '"display: none" not focused') - expect(document.activeElement.style.visibility === 'hidden').toEqual(false, '"visibility: hidden" not focused') + expect(document.activeElement.style.display).not.toBe('none', '"display: none" not focused') + expect(document.activeElement.style.visibility).not.toBe('hidden', '"visibility: hidden" not focused') done() }) diff --git a/js/tests/unit/modal.spec.js b/js/tests/unit/modal.spec.js index 253f93513..9ed1fc434 100644 --- a/js/tests/unit/modal.spec.js +++ b/js/tests/unit/modal.spec.js @@ -637,7 +637,7 @@ describe('Modal', () => { modalEl.addEventListener('shown.bs.modal', () => { modalEl.click() setTimeout(() => { - expect(modalEl.clientHeight === modalEl.scrollHeight).toEqual(true) + expect(modalEl.clientHeight).toEqual(modalEl.scrollHeight) done() }, 20) })