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/dialog | |
| 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/dialog')
| -rw-r--r-- | tests/unit/dialog/dialog.html | 17 | ||||
| -rw-r--r-- | tests/unit/dialog/dialog_core.js | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index fd538442a..6485ac01a 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -3,6 +3,8 @@ <head> <title>jQuery UI Dialog Test Suite</title> + <link type="text/css" href="../../../themes/base/jquery.ui.dialog.css" rel="stylesheet" /> + <script type="text/javascript" src="../../../jquery-1.4.2.js"></script> <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> @@ -13,11 +15,11 @@ <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.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="dialog_core.js"></script> <script type="text/javascript" src="dialog_defaults.js"></script> <script type="text/javascript" src="dialog_events.js"></script> @@ -27,8 +29,13 @@ </head> <body> -<div id="main"> - <div id="dialog1">Dialog Content</div> +<h1 id="qunit-header">jQuery UI Dialog 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;"> </div> </body> diff --git a/tests/unit/dialog/dialog_core.js b/tests/unit/dialog/dialog_core.js index cf76045b4..4618417f0 100644 --- a/tests/unit/dialog/dialog_core.js +++ b/tests/unit/dialog/dialog_core.js @@ -9,7 +9,7 @@ var el, dragged; function dlg() { - return el.data("dialog").element.parents(".ui-dialog:first"); + return el.dialog('widget'); } function isOpen(why) { |