1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

fix(unit-test): dropdown, collapse and carousel

This commit is contained in:
Johann-S 2018-06-17 15:28:42 +02:00 committed by XhmikosR
parent 8010c010e9
commit 6b0808354d
5 changed files with 26 additions and 16 deletions

View file

@ -479,7 +479,7 @@ class Dropdown {
EventHandler.trigger(SelectorEngine.findOne(Selector.DATA_TOGGLE, parent), 'focus') EventHandler.trigger(SelectorEngine.findOne(Selector.DATA_TOGGLE, parent), 'focus')
} }
EventHandler.trigger(this, 'click') Dropdown._clearMenus()
return return
} }

View file

@ -676,7 +676,7 @@ $(function () {
$template.bootstrapCarousel() $template.bootstrapCarousel()
var done = assert.async() var done = assert.async()
function handlerKeydown() { function handlerKeydown(event) {
assert.strictEqual(event.defaultPrevented, false) assert.strictEqual(event.defaultPrevented, false)
$template[0].removeEventListener('keydown', handlerKeydown) $template[0].removeEventListener('keydown', handlerKeydown)
} }
@ -687,7 +687,7 @@ $(function () {
keyDown.which = 40 keyDown.which = 40
$template[0].dispatchEvent(keyDown) $template[0].dispatchEvent(keyDown)
function handlerKeydown2() { function handlerKeydown2(event) {
assert.strictEqual(event.defaultPrevented, false) assert.strictEqual(event.defaultPrevented, false)
$template[0].addEventListener('keydown', handlerKeydown2) $template[0].addEventListener('keydown', handlerKeydown2)
done() done()

View file

@ -73,7 +73,7 @@ $(function () {
assert.ok(!/height/i.test($el2.attr('style')), 'has height reset') assert.ok(!/height/i.test($el2.attr('style')), 'has height reset')
done() done()
}) })
$target[0].dispatchEvent(new Event('click')) $target[0].click()
}) })
QUnit.test('should collapse only the first collapse', function (assert) { QUnit.test('should collapse only the first collapse', function (assert) {
@ -760,11 +760,11 @@ $(function () {
assert.ok($trigger3.hasClass('collapsed'), 'trigger3 has collapsed class') assert.ok($trigger3.hasClass('collapsed'), 'trigger3 has collapsed class')
done() done()
}) })
$trigger1[0].dispatchEvent(new Event('click')) $trigger1[0].click()
}) })
$trigger2[0].dispatchEvent(new Event('click')) $trigger2[0].click()
}) })
$trigger3[0].dispatchEvent(new Event('click')) $trigger3[0].click()
}) })
QUnit.test('should set aria-expanded="true" to triggers targeting shown collaspe and aria-expanded="false" only when all the targeted collapses are shown', function (assert) { QUnit.test('should set aria-expanded="true" to triggers targeting shown collaspe and aria-expanded="false" only when all the targeted collapses are shown', function (assert) {
@ -792,11 +792,11 @@ $(function () {
assert.strictEqual($trigger3.attr('aria-expanded'), 'false', 'aria-expanded on trigger3 is "false"') assert.strictEqual($trigger3.attr('aria-expanded'), 'false', 'aria-expanded on trigger3 is "false"')
done() done()
}) })
$trigger1[0].dispatchEvent(new Event('click')) $trigger1[0].click()
}) })
$trigger2[0].dispatchEvent(new Event('click')) $trigger2[0].click()
}) })
$trigger3[0].dispatchEvent(new Event('click')) $trigger3[0].click()
}) })
QUnit.test('should not prevent interactions inside the collapse element', function (assert) { QUnit.test('should not prevent interactions inside the collapse element', function (assert) {

View file

@ -663,6 +663,8 @@ $(function () {
$dropdown[0].dispatchEvent(keydown40) $dropdown[0].dispatchEvent(keydown40)
assert.ok($(document.activeElement).is($('#item1')), 'item1 is focused') assert.ok($(document.activeElement).is($('#item1')), 'item1 is focused')
keydown40 = new Event('keydown')
keydown40.which = 40
document.activeElement.dispatchEvent(keydown40) document.activeElement.dispatchEvent(keydown40)
assert.ok($(document.activeElement).is($('#item2')), 'item2 is focused') assert.ok($(document.activeElement).is($('#item2')), 'item2 is focused')
@ -899,11 +901,15 @@ $(function () {
assert.ok(document.activeElement === $('#item1')[0], 'item1 is focused') assert.ok(document.activeElement === $('#item1')[0], 'item1 is focused')
done() done()
}).bootstrapDropdown('toggle') })
$input[0].dispatchEvent(new Event('click')) .bootstrapDropdown('toggle')
$input.bootstrapDropdown('toggle')
}) })
$input[0].dispatchEvent(new Event('click'))
$input.bootstrapDropdown('toggle')
}) })
$input[0].dispatchEvent(new Event('click')) $input[0].dispatchEvent(new Event('click'))
}) })
@ -973,10 +979,13 @@ $(function () {
assert.ok(document.activeElement === $('#item1')[0], 'item1 is focused') assert.ok(document.activeElement === $('#item1')[0], 'item1 is focused')
done() done()
}).bootstrapDropdown('toggle') })
$textarea[0].dispatchEvent(new Event('click')) .bootstrapDropdown('toggle')
$textarea.bootstrapDropdown('toggle')
}) })
$textarea[0].dispatchEvent(new Event('click'))
$textarea.bootstrapDropdown('toggle')
}) })
$textarea[0].dispatchEvent(new Event('click')) $textarea[0].dispatchEvent(new Event('click'))
}) })

View file

@ -211,6 +211,7 @@
<script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script> <script src="../../../node_modules/jquery/dist/jquery.slim.min.js"></script>
<script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script> <script src="../../../node_modules/popper.js/dist/umd/popper.min.js"></script>
<script src="../../dist/dom/polyfill.js"></script>
<script src="../../dist/dom/eventHandler.js"></script> <script src="../../dist/dom/eventHandler.js"></script>
<script src="../../dist/dom/data.js"></script> <script src="../../dist/dom/data.js"></script>
<script src="../../dist/dom/selectorEngine.js"></script> <script src="../../dist/dom/selectorEngine.js"></script>