From 9bd99d64e452de70664b38c5f238c7f4eaa04f16 Mon Sep 17 00:00:00 2001 From: GeoSot Date: Mon, 19 Apr 2021 21:45:17 +0300 Subject: [PATCH] Add tests | change existing tests to meet the new check only during click handling --- js/src/tab.js | 3 +- js/tests/unit/tab.spec.js | 121 ++++++++++++++++++++++---------------- 2 files changed, 70 insertions(+), 54 deletions(-) diff --git a/js/src/tab.js b/js/src/tab.js index e03944cfa4d4..4d823cc61c74 100644 --- a/js/src/tab.js +++ b/js/src/tab.js @@ -66,8 +66,7 @@ class Tab extends BaseComponent { show() { if ((this._element.parentNode && this._element.parentNode.nodeType === Node.ELEMENT_NODE && - this._element.classList.contains(CLASS_NAME_ACTIVE)) || - isDisabled(this._element)) { + this._element.classList.contains(CLASS_NAME_ACTIVE))) { return } diff --git a/js/tests/unit/tab.spec.js b/js/tests/unit/tab.spec.js index 5b98bad9d508..4741b495de83 100644 --- a/js/tests/unit/tab.spec.js +++ b/js/tests/unit/tab.spec.js @@ -198,58 +198,6 @@ describe('Tab', () => { }, 30) }) - it('should not fire shown when tab has disabled attribute', done => { - fixtureEl.innerHTML = [ - '', - '
', - '
', - '
', - '
' - ].join('') - - const triggerDisabled = fixtureEl.querySelector('button[disabled]') - const tab = new Tab(triggerDisabled) - - triggerDisabled.addEventListener('shown.bs.tab', () => { - throw new Error('should not trigger shown event') - }) - - tab.show() - setTimeout(() => { - expect().nothing() - done() - }, 30) - }) - - it('should not fire shown when tab has disabled class', done => { - fixtureEl.innerHTML = [ - '', - '
', - '
', - '
', - '
' - ].join('') - - const triggerDisabled = fixtureEl.querySelector('a.disabled') - const tab = new Tab(triggerDisabled) - - triggerDisabled.addEventListener('shown.bs.tab', () => { - throw new Error('should not trigger shown event') - }) - - tab.show() - setTimeout(() => { - expect().nothing() - done() - }, 30) - }) - it('show and shown events should reference correct relatedTarget', done => { fixtureEl.innerHTML = [ '