diff options
| author | Felix Nagel <info@felixnagel.com> | 2017-08-26 13:08:14 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2017-08-26 13:08:14 +0200 |
| commit | 1b885ff76899fb70cce28371968d314ea74b7d7a (patch) | |
| tree | 1a3a19be9d874f9daffd1238950c073ec086ffc2 /tests/unit/selectmenu | |
| parent | 2b611bad90fa6f19e3bf02912c6cd5c08903c993 (diff) | |
| parent | 74f8a0ac952f6f45f773312292baef1c26d81300 (diff) | |
| download | jquery-ui-datepicker.tar.gz jquery-ui-datepicker.zip | |
Merge branch 'master' into datepickerdatepicker
# Conflicts:
# ui/i18n/datepicker-pt.js
Diffstat (limited to 'tests/unit/selectmenu')
| -rw-r--r-- | tests/unit/selectmenu/core.js | 4 | ||||
| -rw-r--r-- | tests/unit/selectmenu/events.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/unit/selectmenu/core.js b/tests/unit/selectmenu/core.js index cef6dc5bf..708452312 100644 --- a/tests/unit/selectmenu/core.js +++ b/tests/unit/selectmenu/core.js @@ -251,13 +251,13 @@ $.each( [ wrappers = menu.find( "li.ui-menu-item .ui-menu-item-wrapper" ); button.trigger( "click" ); - wrappers.first().simulate( "mouseover" ).trigger( "click" ); + wrappers.first().simulate( "mouseover", { clientX: 2, clientY: 2 } ).trigger( "click" ); assert.equal( element[ 0 ].selectedIndex, 0, "First item is selected" ); button.simulate( "keydown", { keyCode: $.ui.keyCode.UP } ); assert.equal( element[ 0 ].selectedIndex, 0, "No looping beyond first item" ); button.trigger( "click" ); - wrappers.last().simulate( "mouseover" ).trigger( "click" ); + wrappers.last().simulate( "mouseover", { clientX: 3, clientY: 3 } ).trigger( "click" ); assert.equal( element[ 0 ].selectedIndex, wrappers.length - 1, "Last item is selected" ); button.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } ); assert.equal( element[ 0 ].selectedIndex, wrappers.length - 1, "No looping behind last item" ); diff --git a/tests/unit/selectmenu/events.js b/tests/unit/selectmenu/events.js index 4aed70ac8..ffc0429ee 100644 --- a/tests/unit/selectmenu/events.js +++ b/tests/unit/selectmenu/events.js @@ -89,9 +89,9 @@ QUnit.test( "focus", function( assert ) { button.trigger( "click" ); links = menu.find( "li.ui-menu-item" ); optionIndex = 0; - links.eq( optionIndex ).simulate( "mouseover" ); + links.eq( optionIndex ).simulate( "mouseover", { clientX: 2, clientY: 2 } ); optionIndex += 1; - links.eq( optionIndex ).simulate( "mouseover" ); + links.eq( optionIndex ).simulate( "mouseover", { clientX: 3, clientY: 3 } ); // This tests for unwanted, additional focus event on close that.element.selectmenu( "close" ); |