diff options
author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-11-15 17:14:19 +0100 |
---|---|---|
committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2012-11-15 17:14:19 +0100 |
commit | f86168bf6b57a06b2faa53f976976fc17cb6cc7e (patch) | |
tree | a18bfd9cf1e75fa1417436798611bc969d9a59ad /tests/unit | |
parent | 8cbbf33192728b51d2b7a05e2a75fa334da54f26 (diff) | |
parent | fb6119e182ece9f2b5f94eb79b8763b602d04c47 (diff) | |
download | jquery-ui-f86168bf6b57a06b2faa53f976976fc17cb6cc7e.tar.gz jquery-ui-f86168bf6b57a06b2faa53f976976fc17cb6cc7e.zip |
Merge branch 'master' into selectmenu
Diffstat (limited to 'tests/unit')
30 files changed, 264 insertions, 40 deletions
diff --git a/tests/unit/accordion/all.html b/tests/unit/accordion/all.html index 8e7948b7b..72eea8341 100644 --- a/tests/unit/accordion/all.html +++ b/tests/unit/accordion/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Accordion Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/all.html b/tests/unit/all.html index d4d7a0376..7581a737b 100644 --- a/tests/unit/all.html +++ b/tests/unit/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Test Suite</title> - <script src="../../jquery-1.8.2.js"></script> + <script src="../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../external/qunit.css"> <link rel="stylesheet" href="qunit-composite.css"> diff --git a/tests/unit/autocomplete/all.html b/tests/unit/autocomplete/all.html index c8eb3bf18..d8551c6b2 100644 --- a/tests/unit/autocomplete/all.html +++ b/tests/unit/autocomplete/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Autocomplete Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/button/all.html b/tests/unit/button/all.html index 04aaeb0c5..1f1f3540c 100644 --- a/tests/unit/button/all.html +++ b/tests/unit/button/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Button Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/core/all.html b/tests/unit/core/all.html index cedd2c1d1..db59cafb2 100644 --- a/tests/unit/core/all.html +++ b/tests/unit/core/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Core Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/datepicker/all.html b/tests/unit/datepicker/all.html index 85a272149..a14863d82 100644 --- a/tests/unit/datepicker/all.html +++ b/tests/unit/datepicker/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Datepicker Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js index 86f71a1c4..ae51b41d0 100644 --- a/tests/unit/datepicker/datepicker_core.js +++ b/tests/unit/datepicker/datepicker_core.js @@ -146,7 +146,7 @@ test('customStructure', function() { dp = $('#ui-datepicker-div'), // Check right-to-left localisation inp = TestHelpers.datepicker.init('#inp', $.datepicker.regional.he); - inp.data('showButtonPanel.datepicker',true); + inp.datepicker( 'option', 'showButtonPanel', true); inp.focus(); ok(dp.is('.ui-datepicker-rtl'), 'Structure RTL - right-to-left'); header = dp.children(':first'); diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js index 9078a2374..7d2b070fa 100644 --- a/tests/unit/datepicker/datepicker_options.js +++ b/tests/unit/datepicker/datepicker_options.js @@ -322,9 +322,10 @@ test('miscellaneous', function() { }); test('minMax', function() { - expect( 17 ); + expect( 19 ); var date, inp = TestHelpers.datepicker.init('#inp'), + dp = $('#ui-datepicker-div'), lastYear = new Date(2007, 6 - 1, 4), nextYear = new Date(2009, 6 - 1, 4), minDate = new Date(2008, 2 - 1, 29), @@ -404,6 +405,11 @@ test('minMax', function() { TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), new Date(2008, 6 - 1, 4), 'Min/max - setDate > min, < max'); inp.datepicker('option', {maxDate: null}).val('01/04/2009').datepicker('option', {minDate: minDate, maxDate: maxDate}); TestHelpers.datepicker.equalsDate(inp.datepicker('getDate'), maxDate, 'Min/max - setDate > max'); + + inp.datepicker('option', {yearRange: '-0:+1'}).val('01/01/' + new Date().getFullYear()); + ok(dp.find(".ui-datepicker-prev").hasClass("ui-state-disabled"), "Year Range Test - previous button disabled at 1/1/minYear"); + inp.datepicker("setDate", "12/30/" + new Date().getFullYear()); + ok(dp.find(".ui-datepicker-next").hasClass("ui-state-disabled"), "Year Range Test - next button disabled at 12/30/maxYear"); }); test('setDate', function() { diff --git a/tests/unit/dialog/all.html b/tests/unit/dialog/all.html index b4f5660cb..f470c519d 100644 --- a/tests/unit/dialog/all.html +++ b/tests/unit/dialog/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Dialog Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/draggable/all.html b/tests/unit/draggable/all.html index c05d729c1..7e055ec52 100644 --- a/tests/unit/draggable/all.html +++ b/tests/unit/draggable/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Draggable Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/droppable/all.html b/tests/unit/droppable/all.html index 0f41d1f1d..22ba18e0f 100644 --- a/tests/unit/droppable/all.html +++ b/tests/unit/droppable/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Droppable Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/effects/all.html b/tests/unit/effects/all.html index b59e44ed6..1773756ad 100644 --- a/tests/unit/effects/all.html +++ b/tests/unit/effects/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Effects Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/index.html b/tests/unit/index.html index c12d5acb9..8075ce2a4 100644 --- a/tests/unit/index.html +++ b/tests/unit/index.html @@ -7,7 +7,7 @@ <link rel="stylesheet" href="../../themes/base/jquery.ui.core.css"> <link rel="stylesheet" href="../../themes/base/jquery.ui.theme.css"> <link rel="stylesheet" href="../index.css"> - <script src="../jquery-1.8.2.js"></script> + <script src="../jquery-1.8.3.js"></script> <script src="../index.js"></script> </head> <body> diff --git a/tests/unit/menu/all.html b/tests/unit/menu/all.html index b7a388833..b05d82146 100644 --- a/tests/unit/menu/all.html +++ b/tests/unit/menu/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Menu Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/position/all.html b/tests/unit/position/all.html index 38e041172..4019fd7c5 100644 --- a/tests/unit/position/all.html +++ b/tests/unit/position/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Position Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/progressbar/all.html b/tests/unit/progressbar/all.html index a88193dc9..7f92267a5 100644 --- a/tests/unit/progressbar/all.html +++ b/tests/unit/progressbar/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Progressbar Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/resizable/all.html b/tests/unit/resizable/all.html index b1b5c239e..469bf8d1d 100644 --- a/tests/unit/resizable/all.html +++ b/tests/unit/resizable/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Resizable Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html index eca465ae9..0a27f2a80 100644 --- a/tests/unit/resizable/resizable.html +++ b/tests/unit/resizable/resizable.html @@ -29,6 +29,18 @@ <script src="resizable_test_helpers.js"></script> <script src="../swarminject.js"></script> + + <style> + #resizable1 { + background: green; + height: 100px; + width: 100px; + } + #resizable2 { + height: 100px; + width: 100px; + } + </style> </head> <body> @@ -39,8 +51,8 @@ <ol id="qunit-tests"></ol> <div id="qunit-fixture"> -<div id="resizable1" style="background: green; width: 100px; height: 100px;">I'm a resizable.</div> -<img src="images/test.jpg" id="resizable2" style="width: 100px; height: 100px;" alt="solid gray"> +<div id="resizable1">I'm a resizable.</div> +<img src="images/test.jpg" id="resizable2" alt="solid gray"> </div> </body> diff --git a/tests/unit/resizable/resizable_core.js b/tests/unit/resizable/resizable_core.js index a1ac22272..447499f05 100644 --- a/tests/unit/resizable/resizable_core.js +++ b/tests/unit/resizable/resizable_core.js @@ -26,7 +26,7 @@ test("element types", function() { */ test("n", function() { - expect(2); + expect(4); var handle = '.ui-resizable-n', target = $('#resizable1').resizable({ handles: 'all' }); @@ -35,10 +35,13 @@ test("n", function() { TestHelpers.resizable.drag(handle, 0, 50); equal( target.height(), 100, "compare height" ); + + equal( target[0].style.left, "", "left should not be modified" ); + equal( target[0].style.width, "", "width should not be modified" ); }); test("s", function() { - expect(2); + expect(5); var handle = '.ui-resizable-s', target = $('#resizable1').resizable({ handles: 'all' }); @@ -47,10 +50,14 @@ test("s", function() { TestHelpers.resizable.drag(handle, 0, -50); equal( target.height(), 100, "compare height" ); + + equal( target[0].style.top, "", "top should not be modified" ); + equal( target[0].style.left, "", "left should not be modified" ); + equal( target[0].style.width, "", "width should not be modified" ); }); test("e", function() { - expect(2); + expect(5); var handle = '.ui-resizable-e', target = $('#resizable1').resizable({ handles: 'all' }); @@ -59,10 +66,14 @@ test("e", function() { TestHelpers.resizable.drag(handle, -50); equal( target.width(), 100, "compare width" ); + + equal( target[0].style.height, "", "height should not be modified" ); + equal( target[0].style.top, "", "top should not be modified" ); + equal( target[0].style.left, "", "left should not be modified" ); }); test("w", function() { - expect(2); + expect(4); var handle = '.ui-resizable-w', target = $('#resizable1').resizable({ handles: 'all' }); @@ -71,10 +82,13 @@ test("w", function() { TestHelpers.resizable.drag(handle, 50); equal( target.width(), 100, "compare width" ); + + equal( target[0].style.height, "", "height should not be modified" ); + equal( target[0].style.top, "", "top should not be modified" ); }); test("ne", function() { - expect(4); + expect(5); var handle = '.ui-resizable-ne', target = $('#resizable1').css({ overflow: 'hidden' }).resizable({ handles: 'all' }); @@ -85,10 +99,12 @@ test("ne", function() { TestHelpers.resizable.drag(handle, 50, 50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); + + equal( target[0].style.left, "", "left should not be modified" ); }); test("se", function() { - expect(4); + expect(6); var handle = '.ui-resizable-se', target = $('#resizable1').resizable({ handles: 'all' }); @@ -99,10 +115,13 @@ test("se", function() { TestHelpers.resizable.drag(handle, -50, -50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); + + equal( target[0].style.top, "", "top should not be modified" ); + equal( target[0].style.left, "", "left should not be modified" ); }); test("sw", function() { - expect(4); + expect(5); var handle = '.ui-resizable-sw', target = $('#resizable1').resizable({ handles: 'all' }); @@ -113,6 +132,8 @@ test("sw", function() { TestHelpers.resizable.drag(handle, 50, 50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); + + equal( target[0].style.top, "", "top should not be modified" ); }); test("nw", function() { diff --git a/tests/unit/resizable/resizable_events.js b/tests/unit/resizable/resizable_events.js index d7793ff2f..14de76da6 100644 --- a/tests/unit/resizable/resizable_events.js +++ b/tests/unit/resizable/resizable_events.js @@ -5,8 +5,165 @@ module("resizable: events"); -// this is here to make JSHint pass "unused", and we don't want to -// remove the parameter for when we finally implement -$.noop(); +test("start", function() { + + expect(5); + + var count = 0, + handle = ".ui-resizable-se"; + + $("#resizable1").resizable({ + handles: "all", + start: function(event, ui) { + equal( ui.size.width, 100, "compare width" ); + equal( ui.size.height, 100, "compare height" ); + equal( ui.originalSize.width, 100, "compare original width" ); + equal( ui.originalSize.height, 100, "compare original height" ); + count++; + } + }); + + TestHelpers.resizable.drag(handle, 50, 50); + + equal(count, 1, "start callback should happen exactly once"); + +}); + +test("resize", function() { + + expect(9); + + var count = 0, + handle = ".ui-resizable-se"; + + $("#resizable1").resizable({ + handles: "all", + resize: function(event, ui) { + if (count === 0) { + equal( ui.size.width, 101, "compare width" ); + equal( ui.size.height, 101, "compare height" ); + equal( ui.originalSize.width, 100, "compare original width" ); + equal( ui.originalSize.height, 100, "compare original height" ); + } else { + equal( ui.size.width, 150, "compare width" ); + equal( ui.size.height, 150, "compare height" ); + equal( ui.originalSize.width, 100, "compare original width" ); + equal( ui.originalSize.height, 100, "compare original height" ); + } + count++; + } + }); + + TestHelpers.resizable.drag(handle, 50, 50); + + equal(count, 2, "resize callback should happen exactly once per size adjustment"); + +}); + +test("resize (min/max dimensions)", function() { + + expect(5); + + var count = 0, + handle = ".ui-resizable-se"; + + $("#resizable1").resizable({ + handles: "all", + minWidth: 60, + minHeight: 60, + maxWidth: 100, + maxHeight: 100, + resize: function(event, ui) { + equal( ui.size.width, 60, "compare width" ); + equal( ui.size.height, 60, "compare height" ); + equal( ui.originalSize.width, 100, "compare original width" ); + equal( ui.originalSize.height, 100, "compare original height" ); + count++; + } + }); + + TestHelpers.resizable.drag(handle, -50, -50); + + equal(count, 1, "resize callback should happen exactly once per size adjustment"); + +}); + +test("resize (containment)", function() { + + expect(5); + + var count = 0, + handle = ".ui-resizable-se", + container = $("#resizable1").wrap("<div>").parent().css({ + height: "100px", + width: "100px" + }); + + $("#resizable1").resizable({ + handles: "all", + containment: container, + resize: function(event, ui) { + equal( ui.size.width, 50, "compare width" ); + equal( ui.size.height, 50, "compare height" ); + equal( ui.originalSize.width, 100, "compare original width" ); + equal( ui.originalSize.height, 100, "compare original height" ); + count++; + } + }); + + TestHelpers.resizable.drag(handle, -50, -50); + + equal(count, 1, "resize callback should happen exactly once per size adjustment"); + +}); + +test("resize (grid)", function() { + + expect(5); + + var count = 0, + handle = ".ui-resizable-se"; + + $("#resizable1").resizable({ + handles: "all", + grid: 50, + resize: function(event, ui) { + equal( ui.size.width, 150, "compare width" ); + equal( ui.size.height, 150, "compare height" ); + equal( ui.originalSize.width, 100, "compare original width" ); + equal( ui.originalSize.height, 100, "compare original height" ); + count++; + } + }); + + TestHelpers.resizable.drag(handle, 50, 50); + + equal(count, 1, "resize callback should happen exactly once per grid-unit size adjustment"); + +}); + +test("stop", function() { + + expect(5); + + var count = 0, + handle = ".ui-resizable-se"; + + $("#resizable1").resizable({ + handles: "all", + stop: function(event, ui) { + equal( ui.size.width, 150, "compare width" ); + equal( ui.size.height, 150, "compare height" ); + equal( ui.originalSize.width, 100, "compare original width" ); + equal( ui.originalSize.height, 100, "compare original height" ); + count++; + } + }); + + TestHelpers.resizable.drag(handle, 50, 50); + + equal(count, 1, "stop callback should happen exactly once"); + +}); })(jQuery); diff --git a/tests/unit/selectable/all.html b/tests/unit/selectable/all.html index be404b7dc..373b9e480 100644 --- a/tests/unit/selectable/all.html +++ b/tests/unit/selectable/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Selectable Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/slider/all.html b/tests/unit/slider/all.html index 1ba3386a0..1cd5e485d 100644 --- a/tests/unit/slider/all.html +++ b/tests/unit/slider/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Slider Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/sortable/all.html b/tests/unit/sortable/all.html index 003ed0ed3..25d437856 100644 --- a/tests/unit/sortable/all.html +++ b/tests/unit/sortable/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Sortable Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/spinner/all.html b/tests/unit/spinner/all.html index c81de0a09..abc19e671 100644 --- a/tests/unit/spinner/all.html +++ b/tests/unit/spinner/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Spinner Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js index 148f35b1e..47d87bfe4 100644 --- a/tests/unit/subsuite.js +++ b/tests/unit/subsuite.js @@ -3,7 +3,7 @@ var versions = [ "1.6", "1.6.1", "1.6.2", "1.6.3", "1.6.4", "1.7", "1.7.1", "1.7.2", - "1.8.0", "1.8.1", "1.8.2", + "1.8.0", "1.8.1", "1.8.2", "1.8.3", "git" ], additionalTests = { diff --git a/tests/unit/tabs/all.html b/tests/unit/tabs/all.html index 4ba90d02f..63af7ac91 100644 --- a/tests/unit/tabs/all.html +++ b/tests/unit/tabs/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Tabs Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js index 42fdf4f9e..18337fe4e 100644 --- a/tests/unit/testsuite.js +++ b/tests/unit/testsuite.js @@ -212,7 +212,7 @@ window.domEqual = function( selector, modifier, message ) { "tabIndex", "title" ]; - +/* function getElementStyles( elem ) { var key, len, style = elem.ownerDocument.defaultView ? @@ -239,7 +239,7 @@ window.domEqual = function( selector, modifier, message ) { return styles; } - +*/ function extract( elem ) { if ( !elem || !elem.length ) { QUnit.push( false, actual, expected, @@ -257,7 +257,8 @@ window.domEqual = function( selector, modifier, message ) { var value = elem.attr( attr ); result[ attr ] = value !== undefined ? value : ""; }); - result.style = getElementStyles( elem[ 0 ] ); + // TODO: Enable when we can figure out what's happening with accordion + //result.style = getElementStyles( elem[ 0 ] ); result.events = $._data( elem[ 0 ], "events" ); result.data = $.extend( {}, elem.data() ); delete result.data[ $.expando ]; diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html index 6329326b9..cb1c14095 100644 --- a/tests/unit/tooltip/all.html +++ b/tests/unit/tooltip/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Tooltip Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js index 69936dba2..c3568bffc 100644 --- a/tests/unit/tooltip/tooltip_core.js +++ b/tests/unit/tooltip/tooltip_core.js @@ -107,4 +107,31 @@ test( "tooltip on .ui-state-disabled element", function() { equal( $( ".ui-tooltip" ).length, 0 ); }); +// http://bugs.jqueryui.com/ticket/8740 +asyncTest( "programmatic focus with async content", function() { + expect( 2 ); + var element = $( "#tooltipped1" ).tooltip({ + content: function( response ) { + setTimeout(function() { + response( "test" ); + }); + } + }); + + element.bind( "tooltipopen", function( event ) { + deepEqual( event.originalEvent.type, "focusin" ); + + element.bind( "tooltipclose", function( event ) { + deepEqual( event.originalEvent.type, "focusout" ); + start(); + }); + + setTimeout(function() { + element.blur(); + }); + }); + + element.focus(); +}); + }( jQuery ) ); diff --git a/tests/unit/widget/all.html b/tests/unit/widget/all.html index b02a43cc9..461b2a931 100644 --- a/tests/unit/widget/all.html +++ b/tests/unit/widget/all.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Widget Test Suite</title> - <script src="../../../jquery-1.8.2.js"></script> + <script src="../../../jquery-1.8.3.js"></script> <link rel="stylesheet" href="../../../external/qunit.css"> <link rel="stylesheet" href="../qunit-composite.css"> |