diff options
| author | Richard Worth <rdworth@gmail.com> | 2010-02-25 11:09:39 +0000 |
|---|---|---|
| committer | Richard Worth <rdworth@gmail.com> | 2010-02-25 11:09:39 +0000 |
| commit | 9483dcdbe61f33e2cc5ea0c56297f254a82990b8 (patch) | |
| tree | 66016c8591af13a8010f3517e7350c153f2887cd /tests/unit/datepicker | |
| parent | 1fd3e6bd0b2bbb06cb4135506e039aad84d15d62 (diff) | |
| download | jquery-ui-9483dcdbe61f33e2cc5ea0c56297f254a82990b8.tar.gz jquery-ui-9483dcdbe61f33e2cc5ea0c56297f254a82990b8.zip | |
Externals: updated QUnit to http://github.com/jquery/qunit commit 67ba5a338d836014c24345dc218ab3c9bb63b06e
The various updates to the unit test suites introduced 0 regressions due to update of QUnit, however the addition of jquery.ui.dialog.css to the dialog test suite did introduce one regression, to the dialog option height tests.
Also removed some old crufty woefully incomplete unused and rotted test harnesses.
Diffstat (limited to 'tests/unit/datepicker')
| -rw-r--r-- | tests/unit/datepicker/datepicker.html | 16 | ||||
| -rw-r--r-- | tests/unit/datepicker/datepicker_options.js | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html index 4f6dadc8b..f26db7782 100644 --- a/tests/unit/datepicker/datepicker.html +++ b/tests/unit/datepicker/datepicker.html @@ -3,7 +3,7 @@ <head> <title>jQuery UI Datepicker Test Suite</title> - <link type="text/css" href="../../../themes/base/jquery.ui.base.css" rel="stylesheet" /> + <link type="text/css" href="../../../themes/base/jquery.ui.datepicker.css" rel="stylesheet" /> <script type="text/javascript" src="../../../jquery-1.4.2.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> @@ -12,11 +12,11 @@ <script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-fr.js"></script> <script type="text/javascript" src="../../../ui/i18n/jquery.ui.datepicker-he.js"></script> - <link type="text/css" href="../testsuite.css" rel="stylesheet" /> - <script type="text/javascript" src="../../../external/testrunner-r6588.js"></script> + <link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/> + <script type="text/javascript" src="../../../external/qunit.js"></script> <script type="text/javascript" src="../../jquery.simulate.js"></script> <script type="text/javascript" src="../testsuite.js"></script> - + <script type="text/javascript" src="datepicker_core.js"></script> <script type="text/javascript" src="datepicker_defaults.js"></script> <script type="text/javascript" src="datepicker_events.js"></script> @@ -26,7 +26,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Datepicker Test Suite</h1> +<h2 id="qunit-banner"></h2> +<h2 id="qunit-userAgent"></h2> +<ol id="qunit-tests"> +</ol> + +<div id="main" style="position: absolute; top: -10000px; left: -10000px;"> <p><input type="text" id="inp"/><input type="text" id="alt"/><div id="inl"></div></p> </div> diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js index 9656b69d7..7011fd5a1 100644 --- a/tests/unit/datepicker/datepicker_options.js +++ b/tests/unit/datepicker/datepicker_options.js @@ -684,7 +684,7 @@ test('callbacks', function() { equals($.datepicker._get(inst, 'currentText'), 'Current', 'Before show - changed'); ok(beforeShowThis.id == inp[0].id, 'Before show - this OK'); ok(beforeShowInput.id == inp[0].id, 'Before show - input OK'); - isObj(beforeShowInst, inst, 'Before show - inst OK'); + deepEqual(beforeShowInst, inst, 'Before show - inst OK'); inp.datepicker('hide').datepicker('destroy'); // Before show day inp = init('#inp', {beforeShowDay: beforeDay}); @@ -734,7 +734,7 @@ test('localisation', function() { test('noWeekends', function() { for (var i = 1; i <= 31; i++) { var date = new Date(2001, 1 - 1, i); - isSet($.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ''], + deepEqual($.datepicker.noWeekends(date), [(i + 1) % 7 >= 2, ''], 'No weekends ' + date); } }); |