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 | |
| 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')
32 files changed, 230 insertions, 670 deletions
diff --git a/tests/index.html b/tests/index.html index 25c4b425c..4a50c2015 100644 --- a/tests/index.html +++ b/tests/index.html @@ -4,49 +4,18 @@ <title>jQuery UI Tests</title> <link rel="stylesheet" href="../themes/base/jquery.ui.all.css" type="text/css" /> <script type="text/javascript" src="../jquery-1.4.2.js"></script> - <script type="text/javascript" src="../external/jsdiff.js"></script> <link rel="stylesheet" href="tests.css" type="text/css" /> <script type="text/javascript" src="tests.js"></script> </head> <body> -<table id="matrix"> -<thead> - <tr> - <th>Interaction</th> - <th style="width:220px;">Static</th> - <th style="width:220px;">Visual</th> - <th>Static</th> - <th>Visual</th> - <th>Diff</th> - </tr> -</thead> -<tbody> - <tr class="test-draggable-default"><th>Draggable</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-droppable-default"><th>Droppable</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-resizable-default"><th>Resizable</th><td></td><td></td><td></td><td></td><td></td></tr> - <!--tr class="test-selectable-default"><th>Selectable</th><td></td><td></td><td></td><td></td><td></td></tr--> - <tr class="test-sortable-default"><th>Sortable</th><td></td><td></td><td></td><td></td><td></td></tr> -</tbody> -<thead> - <tr> - <th>Widget</th> - <th style="width:220px;">Static</th> - <th style="width:220px;">Visual</th> - <th>Static</th> - <th>Visual</th> - <th>Diff</th> - </tr> -</thead> -<tbody> - <tr class="test-accordion-default"><th>Accordion</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-datepicker-default"><th>Datepicker</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-dialog-default"><th>Dialog</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-progressbar-default"><th>Progressbar</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-slider-default"><th>slider</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-tabs-default"><th>Tabs</th><td></td><td></td><td></td><td></td><td></td></tr> -</tbody> -</table> +<h1>jQuery UI Tests</h1> + +<h2><a href="static/index.html">Static Tests</a></h2> + +<h2><a href="unit/index.html">Unit Tests</a></h2> + +<h2><a href="visual/index.html">Visual Tests</a></h2> </body> </html> diff --git a/tests/slider.html b/tests/slider.html deleted file mode 100644 index 94eac2550..000000000 --- a/tests/slider.html +++ /dev/null @@ -1,63 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <title>jQuery UI Tests</title> - <link rel="stylesheet" href="../themes/base/jquery.ui.all.css" type="text/css" /> - <script type="text/javascript" src="../jquery-1.4.2.js"></script> - <script type="text/javascript" src="../external/jsdiff.js"></script> - <link rel="stylesheet" href="tests.css" type="text/css" /> - <script type="text/javascript" src="tests.js"></script> -</head> -<body> - -<table id="matrix"> -<thead> - <tr> - <th>Default Slider Tests</th> - <th style="width:220px;">Static</th> - <th style="width:220px;">Visual</th> - <th>Static</th> - <th>Visual</th> - <th>Diff</th> - </tr> -</thead> -<tbody> - <tr class="test-slider-default"><th>Default</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-slider-default-vertical"><th>Vertical</th><td></td><td></td><td></td><td></td><td></td></tr> -</tbody> -<thead> - <tr> - <th>Horizontal Slider Tests</th> - <th style="width:220px;">Static</th> - <th style="width:220px;">Visual</th> - <th>Static</th> - <th>Visual</th> - <th>Diff</th> - </tr> -</thead> -<tbody> - <tr class="test-slider-slider-horizontal"><th>Horizontal</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-slider-slider-horizontal-range"><th>Horizontal range</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-slider-slider-horizontal-range-max"><th>Horizontal range max</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-slider-slider-horizontal-range-min"><th>Horizontal range min</th><td></td><td></td><td></td><td></td><td></td></tr> -</tbody> -<thead> - <tr> - <th>Vertical Slider Tests</th> - <th style="width:220px;">Static</th> - <th style="width:220px;">Visual</th> - <th>Static</th> - <th>Visual</th> - <th>Diff</th> - </tr> -</thead> -<tbody> - <tr class="test-slider-slider-vertical"><th>Vertical</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-slider-slider-vertical-range"><th>Vertical range</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-slider-slider-vertical-range-max"><th>Vertical range max</th><td></td><td></td><td></td><td></td><td></td></tr> - <tr class="test-slider-slider-vertical-range-min"><th>Vertical range min</th><td></td><td></td><td></td><td></td><td></td></tr> -</tbody> -</table> - -</body> -</html> diff --git a/tests/static/all.html b/tests/static/all.html deleted file mode 100644 index cca97f64b..000000000 --- a/tests/static/all.html +++ /dev/null @@ -1,39 +0,0 @@ -<!doctype html> -<html> -<head> - <title>jQuery UI Static Markup Test Page</title> - <link rel="stylesheet" href="../../themes/base/jquery.ui.base.css" type="text/css" /> - <link rel="stylesheet" href="../../themes/base/jquery.ui.theme.css" type="text/css" title="ui-theme" /> - <script type="text/javascript" src="../../jquery-1.4.2.js"></script> - <script type="text/javascript" src="static.js"></script> - <style type="text/css"> - dd.plugin { margin-top: 0.3em; margin-bottom: 1em; } - </style> -</head> -<body style="font-size: 62.5%;"> - -<dl id="plugins"> - -</dl> - -<script type="text/javascript"> - -var plugins = $("#plugins"); - -$("accordion datepicker dialog progressbar slider tabs".split(" ")).each(function() { - - var pluginName = this; - var url = pluginName + '/' + pluginName + ".html"; - - $('<dt><a href="' + url + '">' + url + '</a></dt>').appendTo(plugins); - $('<dd class="plugin"></dd>').load(url, function() { - var plugin = $(this).find(".ui-" + pluginName).remove(); - $(this).empty().append(plugin); - }).appendTo(plugins); - -}); - -</script> - -</body> -</html> diff --git a/tests/static/index.html b/tests/static/index.html index e33645d1b..5baf14368 100644 --- a/tests/static/index.html +++ b/tests/static/index.html @@ -1,7 +1,7 @@ <!doctype html> <html lang="en"> <head> - <title>Static Tests</title> + <title>jQuery UI Static Tests</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" /> <script type="text/javascript" src="../../jquery-1.4.2.js"></script> <script type="text/javascript"> @@ -12,6 +12,8 @@ </head> <body> + +<h1>jQuery UI Static Tests</h1> <h2>Interactions</h2> <ul> @@ -25,6 +27,8 @@ <h2>Widgets</h2> <ul> <li><a href="accordion/default.html">Accordion</a></li> + <li><a href="autocomplete/default.html">Autocomplete</a></li> + <li><a href="button/default.html">Button</a></li> <li><a href="datepicker/default.html">Datepicker</a></li> <li><a href="dialog/default.html">Dialog</a></li> <li><a href="progressbar/default.html">Progressbar</a></li> diff --git a/tests/tests.css b/tests/tests.css deleted file mode 100644 index 353a503f9..000000000 --- a/tests/tests.css +++ /dev/null @@ -1,8 +0,0 @@ -/* tests.css */ - -body { font-size: 62.5%; } -iframe { border: 0; width: 200px; height: 150px; } -td { border: 1px solid silver; padding: 10px; } -td textarea { font-size: 10px; } -del { background: #FFE6E6; } -ins { background: #E6FFE6; } diff --git a/tests/tests.js b/tests/tests.js deleted file mode 100644 index 7f5f4fc17..000000000 --- a/tests/tests.js +++ /dev/null @@ -1,56 +0,0 @@ -/* tests.js */ - -$(function() { - -var matrix = $("#matrix"); - -matrix.children("tbody").children("tr").each(function() { - - var tr = $(this), th = tr.find("th"), pluginName = th.text().toLowerCase(), - staticTd = th.next(), visualTd = staticTd.next(), - staticHtmlTd = visualTd.next(), visualHtmlTd = staticHtmlTd.next(), - diffTd = visualHtmlTd.next(); - - var className = tr.attr("className"); - var classNames = className.split('-'); - - classNames.shift(); // remove 'test' - var folder = classNames.shift(); - var filename = classNames.join('_') + '.html'; - - var staticUrl = 'static/' + folder + '/' + filename; - var visualUrl = 'visual/' + folder + '/' + filename; - - $.get(staticUrl, function(data) { - data = data.replace(/<script.*>.*<\/script>/ig,""); // Remove script tags - data = data.replace(/<\/?link.*>/ig,""); //Remove link tags - data = data.replace(/<\/?html.*>/ig,""); //Remove html tag - data = data.replace(/<\/?body.*>/ig,""); //Remove body tag - data = data.replace(/<\/?head.*>/ig,""); //Remove head tag - data = data.replace(/<title.*>.*<\/title>/ig,""); // Remove title tags - data = data.replace(/\s*<\/?!doctype.*>\s*/ig,""); //Remove doctype - var staticHtml = $("<div></div>").html(data).html(); - staticTd.html(staticHtml); - staticHtmlTd.append("<textarea>" + staticHtml + "</textarea>"); - }); - - visualTd.append('<iframe src="' + visualUrl + '"></iframe>'); - - var iframe = visualTd.find("iframe"); - - iframe.load(function() { - var visualHtml = $("body", this.contentDocument).html() - $(this).after(visualHtml).remove(); - (pluginName == 'dialog') && $("#dialog").parents(".ui-dialog").css({ - position: "relative", - top: null, left: null - }); - visualHtmlTd.append("<textarea>" + $.trim(visualHtml) + "</textarea>"); - var diffHtml = diffString(escape(staticHtmlTd.find("textarea").val()), escape(visualHtmlTd.find("textarea").val())); - console.log(diffHtml); - diffTd.html(diffHtml); - }); - -}); - -}); diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html index 0575df68e..ac49fdcad 100644 --- a/tests/unit/accordion/accordion.html +++ b/tests/unit/accordion/accordion.html @@ -3,13 +3,15 @@ <head> <title>jQuery UI Accordion Test Suite</title> + <link type="text/css" href="../../../themes/base/jquery.ui.accordion.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> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.accordion.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> @@ -21,12 +23,18 @@ <script type="text/javascript" src="accordion_tickets.js"></script> <style> - .ui-accordion-li-fix { margin: 0em; padding: 0 } + #main { font-size: 10pt; font-family: 'trebuchet ms', verdana, arial; } </style> </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Accordion 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 id="list1"> <a>There is one obvious advantage:</a> diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js index ddb2c38cb..237ff40d3 100644 --- a/tests/unit/accordion/accordion_options.js +++ b/tests/unit/accordion/accordion_options.js @@ -116,9 +116,9 @@ test("{ fillSpace: false }, default", function() { test("{ fillSpace: true }", function() { $("#navigationWrapper").height(500); $('#navigation').accordion({ fillSpace: true }); - equals( $('#navigation > li:eq(0) > ul').height(), 386 ); - equals( $('#navigation > li:eq(1) > ul').height(), 386 ); - equals( $('#navigation > li:eq(2) > ul').height(), 386 ); + equals( $('#navigation > li:eq(0) > ul').height(), 281 ); + equals( $('#navigation > li:eq(1) > ul').height(), 281 ); + equals( $('#navigation > li:eq(2) > ul').height(), 281 ); }); test("{ header: '> li > :first-child,> :not(li):even' }, default", function() { diff --git a/tests/unit/all.html b/tests/unit/all.html deleted file mode 100644 index 533276a78..000000000 --- a/tests/unit/all.html +++ /dev/null @@ -1,301 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <title>jQuery UI All Tests</title> - <link rel="stylesheet" href="testsuite.css" type="text/css"> - - <script type="text/javascript" src="../../jquery-1.4.2.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script> - - <script type="text/javascript" src="../../external/testrunner-r6588.js"></script> - <script type="text/javascript" src="../../external/jquery.cookie.js"></script> - <script type="text/javascript" src="../jquery.simulate.js"></script> - <script type="text/javascript" src="testsuite.js"></script> - - <script type="text/javascript" src="core/core.js"></script> - <script type="text/javascript" src="core/selector.js"></script> - - <script type="text/javascript" src="draggable/draggable_core.js"></script> - <script type="text/javascript" src="draggable/draggable_defaults.js"></script> - <script type="text/javascript" src="draggable/draggable_events.js"></script> - <script type="text/javascript" src="draggable/draggable_methods.js"></script> - <script type="text/javascript" src="draggable/draggable_options.js"></script> - <script type="text/javascript" src="draggable/draggable_tickets.js"></script> - <script type="text/javascript" src="droppable/droppable_core.js"></script> - <script type="text/javascript" src="droppable/droppable_defaults.js"></script> - <script type="text/javascript" src="droppable/droppable_events.js"></script> - <script type="text/javascript" src="droppable/droppable_methods.js"></script> - <script type="text/javascript" src="droppable/droppable_options.js"></script> - <script type="text/javascript" src="droppable/droppable_tickets.js"></script> - <script type="text/javascript" src="resizable/resizable_core.js"></script> - <script type="text/javascript" src="resizable/resizable_defaults.js"></script> - <script type="text/javascript" src="resizable/resizable_events.js"></script> - <script type="text/javascript" src="resizable/resizable_methods.js"></script> - <script type="text/javascript" src="resizable/resizable_options.js"></script> - <script type="text/javascript" src="resizable/resizable_tickets.js"></script> - <script type="text/javascript" src="selectable/selectable_core.js"></script> - <script type="text/javascript" src="selectable/selectable_defaults.js"></script> - <script type="text/javascript" src="selectable/selectable_events.js"></script> - <script type="text/javascript" src="selectable/selectable_methods.js"></script> - <script type="text/javascript" src="selectable/selectable_options.js"></script> - <script type="text/javascript" src="selectable/selectable_tickets.js"></script> - <script type="text/javascript" src="sortable/sortable_core.js"></script> - <script type="text/javascript" src="sortable/sortable_defaults.js"></script> - <script type="text/javascript" src="sortable/sortable_events.js"></script> - <script type="text/javascript" src="sortable/sortable_methods.js"></script> - <script type="text/javascript" src="sortable/sortable_options.js"></script> - <script type="text/javascript" src="sortable/sortable_tickets.js"></script> - - <script type="text/javascript" src="accordion/accordion_core.js"></script> - <script type="text/javascript" src="accordion/accordion_defaults.js"></script> - <script type="text/javascript" src="accordion/accordion_events.js"></script> - <script type="text/javascript" src="accordion/accordion_methods.js"></script> - <script type="text/javascript" src="accordion/accordion_options.js"></script> - <script type="text/javascript" src="accordion/accordion_tickets.js"></script> - <script type="text/javascript" src="datepicker/datepicker_core.js"></script> - <script type="text/javascript" src="datepicker/datepicker_defaults.js"></script> - <script type="text/javascript" src="datepicker/datepicker_events.js"></script> - <script type="text/javascript" src="datepicker/datepicker_methods.js"></script> - <script type="text/javascript" src="datepicker/datepicker_options.js"></script> - <script type="text/javascript" src="datepicker/datepicker_tickets.js"></script> - <script type="text/javascript" src="dialog/dialog_core.js"></script> - <script type="text/javascript" src="dialog/dialog_defaults.js"></script> - <script type="text/javascript" src="dialog/dialog_events.js"></script> - <script type="text/javascript" src="dialog/dialog_methods.js"></script> - <script type="text/javascript" src="dialog/dialog_options.js"></script> - <script type="text/javascript" src="dialog/dialog_tickets.js"></script> - <script type="text/javascript" src="progressbar/progressbar_core.js"></script> - <script type="text/javascript" src="progressbar/progressbar_defaults.js"></script> - <script type="text/javascript" src="progressbar/progressbar_events.js"></script> - <script type="text/javascript" src="progressbar/progressbar_methods.js"></script> - <script type="text/javascript" src="progressbar/progressbar_options.js"></script> - <script type="text/javascript" src="progressbar/progressbar_tickets.js"></script> - <script type="text/javascript" src="slider/slider_core.js"></script> - <script type="text/javascript" src="slider/slider_defaults.js"></script> - <script type="text/javascript" src="slider/slider_events.js"></script> - <script type="text/javascript" src="slider/slider_methods.js"></script> - <script type="text/javascript" src="slider/slider_options.js"></script> - <script type="text/javascript" src="slider/slider_tickets.js"></script> - <script type="text/javascript" src="tabs/tabs_core.js"></script> - <script type="text/javascript" src="tabs/tabs_defaults.js"></script> - <script type="text/javascript" src="tabs/tabs_events.js"></script> - <script type="text/javascript" src="tabs/tabs_methods.js"></script> - <script type="text/javascript" src="tabs/tabs_options.js"></script> - <script type="text/javascript" src="tabs/tabs_tickets.js"></script> - - <style type="text/css"> - @import "../../../themes/base/jquery.ui.datepicker.css"; - .xerror, .error, .ui-tabs-hide { - display: none; - } - </style> - -</head> -<body> - <h1>jQuery UI All Tests</h1> - <h2 id="banner"></h2> - <h2 id="userAgent"></h2> - - <h3>Run individual testsuites or doubleclick a test below</h3> - - <h4>Core</h4> - <ul> - <li><a href="core/core.html">Core</a></li> - </ul> - - <h4>Interactions</h4> - <ul> - <li><a href="draggable/draggable.html">Draggable</a></li> - <li><a href="droppable/droppable.html">Droppable</a></li> - <li><a href="resizable/resizable.html">Resizable</a></li> - <li><a href="selectable/selectable.html">Selectable</a></li> - <li><a href="sortable/sortable.html">Sortable</a></li> - </ul> - - <h4>Widgets</h4> - <ul> - <li><a href="accordion/accordion.html">Accordion</a></li> - <li><a href="datepicker/datepicker.html">Datepicker</a></li> - <li><a href="dialog/dialog.html">Dialog</a></li> - <li><a href="progressbar/progressbar.html">Progressbar</a></li> - <li><a href="slider/slider.html">Slider</a></li> - <li><a href="tabs/tabs.html">Tabs</a></li> - </ul> - - <ol id="tests"></ol> - - <div id="main" style="position:absolute;top:-2000000px;"> - - <p><input type="text" id="dp1"/><input type="text" id="rem"/></p> - - <div id="draggable1" style="background: green; width: 200px; height: 100px;">Relative</div> - <div id="draggable2" style="background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;"><span>Absolute</span></div> - - <div id="slider1"></div> - <div id="slider3" style="position: relative; margin: 40px; width: 217px; height: 28px;"> - <div class="ui-slider-handle" style="position: absolute; height: 21px; left: 0px; bottom: 0px; width: 17px;"></div> - </div> - - <div id="list1"> - <a>There is one obvious advantage:</a> - <div> - <p> - You've seen it coming!<br/> - Buy now and get nothing for free!<br/> - Well, at least no free beer. Perhaps a bear, if you can afford it. - </p> - </div> - <a>Now that you've got...</a> - <div> - <p> - your bear, you have to admit it!<br/> - No, we aren't selling bears. - </p> - <p> - We could talk about renting one. - </p> - </div> - <a>Rent one bear, ...</a> - <div> - <p> - get two for three beer. - </p> - <p> - And now, for something completely different. - </p> - </div> - </div> - - <ul id="navigation"> - <li> - <a class="head" href="?p=1.1.1">Guitar</a> - <ul> - <li><a href="?p=1.1.1.1">Electric</a></li> - <li><a href="?p=1.1.1.2">Acoustic</a></li> - <li><a href="?p=1.1.1.3">Amps</a></li> - <li><a href="?p=1.1.1.4">Effects</a></li> - <li><a href="?p=1.1.1.5">Accessories</a></li> - </ul> - </li> - <li> - <a class="head" href="?p=1.1.2"><span>Bass</span></a> - <ul> - <li><a href="?p=1.1.2.1">Electric</a></li> - <li><a href="?p=1.1.2.2">Acoustic</a></li> - <li><a href="?p=1.1.2.3">Amps</a></li> - <li><a href="?p=1.1.2.4">Effects</a></li> - <li><a href="?p=1.1.2.5">Accessories</a></li> - <li><a href="?p=1.1.2.5">Accessories</a></li> - <li><a href="?p=1.1.2.5">Accessories</a></li> - </ul> - </li> - <li> - <a class="head" href="?p=1.1.3">Drums</a> - <ul> - <li><a href="?p=1.1.3.2">Acoustic Drums</a></li> - <li><a href="?p=1.1.3.3">Electronic Drums</a></li> - <li><a href="?p=1.1.3.6">Accessories</a></li> - </ul> - </li> - </ul> - <dl id="list2"> - <dt class="red">Red</dt> - <dd> - Fancy stuff about red thingies. - </dd> - <dt class="green selected">Green</dt> - <dd> - Green! Green! Green! - </dd> - <dt class="blue">Blue</dt> - <dd> - Cool kids are blue. - </dd> - </dl> - - <div id="list3"> - <div> - <div class="title">Tennis</div> - <div> - One ball, two players. Lots of fun. - </div> - </div> - <div> - <div class="title">Soccer</div> - <div> - One ball, 22 players. Lots of fun. - </div> - </div> - <div> - <div class="title">Baseball</div> - <div> - Well, one ball, some guys running around, some guys hitting others with a stick.<br/> - Sounds like fun, doesn't it? - </div> - <div> - Well, apart from the running part. - </div> - </div> - </div> - - <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;"/> - - - <ul id="selectable1"> - <li>Item 1</li> - <li>Item 2</li> - <li class="special">Item 3</li> - <li>Item 4</li> - <li>Item 5</li> - </ul> - - <ul id="sortable"> - <li>Item 1</li> - <li>Item 2</li> - <li>Item 3</li> - <li>Item 4</li> - <li>Item 5</li> - </ul> - - <p><input type="text" id="inp"/><input type="text" id="alt"/><div id="inl"></div></p> - - <input type="text" id="spin" /> - - <div id="progressbar"></div> - - <div id="tabs1"> - <ul> - <li><a href="#fragment-1">1</a></li> - <li><a href="#fragment-2">2</a></li> - <li><a href="#fragment-3">3</a></li> - </ul> - <div id="fragment-1"></div> - <div id="fragment-2"></div> - <div id="fragment-3"></div> - </div> - <div id="tabs2"> - <ul> - <li><a href="#colon:test">1</a></li> - <li><a href="#inline-style">2</a></li> - </ul> - <div id="colon:test"></div> - <div style="height: 300px;" id="inline-style"></div> - </div> - -</div> - </body> -</html>
\ No newline at end of file diff --git a/tests/unit/all_2.html b/tests/unit/all_2.html deleted file mode 100644 index 9ae43029e..000000000 --- a/tests/unit/all_2.html +++ /dev/null @@ -1,84 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <title>jQuery UI All Tests</title> - <link rel="stylesheet" href="testsuite.css" type="text/css"> - - <script type="text/javascript" src="../../jquery-1.4.2.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> - - <script type="text/javascript"> - var components = ["accordion","datepicker","dialog","draggable","progressbar","resizable","selectable","slider","sortable","tabs"]; - - $(function() { - - var $list = $("#individual_list"), - $main = $("#main"); - - $.each(components, function(i, val){ - $list.append('<li><a href="' + val + '/' + val + '.html">' + val + '</a></li>'); - $('<div class="component_panel" id="' + val + '">').appendTo($main); - $('#' + val).load(val + '.html #main *'); - }); - - loadScripts(); - - function loadScripts() { - if ( $("div.component_panel").length == components.length ) { - $.each(components, function(i, val){ - $('head').append('<script type="text/javascript" src="' + val + '.js"></scr'+'ipt>'); - }); - } else { - setTimeout(loadScripts, 10); - } - } - - - }); - - - </script> - - <script type="text/javascript" src="../../ui/jquery.ui.accordion.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.datepicker.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.progressbar.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.selectable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.sortable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script> - - <script type="text/javascript" src="../../external/testrunner-r6588.js"></script> - <script type="text/javascript" src="../../external/jquery.cookie.js"></script> - <script type="text/javascript" src="../jquery.simulate.js"></script> - - <style type="text/css"> - @import "../../../themes/base/jquery.ui.datepicker.css"; - .xerror, .error, .ui-tabs-hide { - display: none; - } - </style> - -</head> -<body> - <h1>jQuery UI All Tests</h1> - <h2 id="banner"></h2> - <h2 id="userAgent"></h2> - - <h4>Run individual testsuites or doubleclick a test below</h4> - <ul id="individual_list"> - </ul> - - <ol id="tests"></ol> - - <div id="main" style="position:absolute; top:-2000000px;"> - - </div> - - </body> -</html>
\ No newline at end of file diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html index 1d4637c5b..38ed54b7e 100644 --- a/tests/unit/autocomplete/autocomplete.html +++ b/tests/unit/autocomplete/autocomplete.html @@ -3,6 +3,8 @@ <head> <title>jQuery UI Autocomplete Test Suite</title> + <link type="text/css" href="../../../themes/base/jquery.ui.autocomplete.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> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> @@ -10,8 +12,8 @@ <script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.autocomplete.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> @@ -23,9 +25,15 @@ <script type="text/javascript" src="autocomplete_tickets.js"></script> </head> -<body> +<body id="body"> + +<h1 id="qunit-header">jQuery UI Autocomplete Test Suite</h1> +<h2 id="qunit-banner"></h2> +<h2 id="qunit-userAgent"></h2> +<ol id="qunit-tests"> +</ol> -<div id="main"> +<div id="main" style="position: absolute; top: -10000px; left: -10000px;"> <div><input id="autocomplete" class="foo" /></div> diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html index 255c9c71b..593916ef1 100644 --- a/tests/unit/button/button.html +++ b/tests/unit/button/button.html @@ -3,16 +3,18 @@ <head> <title>jQuery UI Button Test Suite</title> + <link type="text/css" href="../../../themes/base/jquery.ui.button.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> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.button.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="button_core.js"></script> <script type="text/javascript" src="button_defaults.js"></script> <script type="text/javascript" src="button_events.js"></script> @@ -23,7 +25,14 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Button 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><button id="button" class="foo">Label</button></div> diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html index b7b91aaf9..456684e6e 100644 --- a/tests/unit/core/core.html +++ b/tests/unit/core/core.html @@ -7,11 +7,10 @@ <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.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="core.js"></script> <script type="text/javascript" src="selector.js"></script> @@ -22,7 +21,14 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Core 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> <input id="visibleAncestor-inputTypeNone" /> <input type="text" id="visibleAncestor-inputTypeText" /> 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); } }); diff --git a/tests/unit/defaults.html b/tests/unit/defaults.html index 99b2aa797..06b44dcff 100644 --- a/tests/unit/defaults.html +++ b/tests/unit/defaults.html @@ -4,8 +4,10 @@ <title>jQuery UI Defaults</title> <script type="text/javascript" src="../../jquery-1.4.2.js"></script> + <script type="text/javascript" src="../../external/jquery.cookie.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> + <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.droppable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> @@ -18,18 +20,19 @@ <script type="text/javascript" src="../../ui/jquery.ui.slider.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.tabs.js"></script> - <link type="text/css" href="testsuite.css" rel="stylesheet" /> - <script type="text/javascript" src="testsuite.js"></script> - <script type="text/javascript" src="../../external/testrunner-r6588.js"></script> - <script type="text/javascript" src="../../external/jquery.cookie.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="draggable/draggable_defaults.js"></script> <script type="text/javascript" src="droppable/droppable_defaults.js"></script> <script type="text/javascript" src="resizable/resizable_defaults.js"></script> <script type="text/javascript" src="selectable/selectable_defaults.js"></script> <script type="text/javascript" src="sortable/sortable_defaults.js"></script> + <script type="text/javascript" src="autocomplete/autocomplete_defaults.js"></script> <script type="text/javascript" src="accordion/accordion_defaults.js"></script> + <script type="text/javascript" src="button/button_defaults.js"></script> <script type="text/javascript" src="datepicker/datepicker_defaults.js"></script> <script type="text/javascript" src="dialog/dialog_defaults.js"></script> <script type="text/javascript" src="progressbar/progressbar_defaults.js"></script> @@ -37,7 +40,16 @@ <script type="text/javascript" src="tabs/tabs_defaults.js"></script> </head> <body> - <div id="main"> - </div> + +<h1 id="qunit-header"></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> </html> 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) { diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html index 1cd533cee..0bd56a280 100644 --- a/tests/unit/draggable/draggable.html +++ b/tests/unit/draggable/draggable.html @@ -9,8 +9,8 @@ <script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.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> @@ -23,7 +23,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Draggable 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 id="draggable1" style="background: green; width: 200px; height: 100px;">Relative</div> <div id="draggable2" style="background: green; width: 200px; height: 100px; position: absolute; top: 10px; left: 10px;"><span>Absolute</span></div> <div style='width: 1px; height: 1000px;'></div> diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html index 42bfa4899..d47229650 100644 --- a/tests/unit/droppable/droppable.html +++ b/tests/unit/droppable/droppable.html @@ -10,11 +10,11 @@ <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.droppable.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="droppable_core.js"></script> <script type="text/javascript" src="droppable_defaults.js"></script> <script type="text/javascript" src="droppable_events.js"></script> @@ -24,7 +24,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Droppable 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 id="draggable1" style="width: 25px; height: 25px;">Draggable</div> <div id="droppable1" style="width: 100px; height: 100px;">Droppable</div> <div style='width:1000px;height:1000px;'> </div> diff --git a/tests/unit/index.html b/tests/unit/index.html index 11f478bf7..325d5127f 100644 --- a/tests/unit/index.html +++ b/tests/unit/index.html @@ -1,10 +1,22 @@ <!doctype html> <html lang="en"> <head> - <title>jQuery UI Unit Test Suite</title> + <title>jQuery UI Unit Tests</title> <link type="text/css" href="../../themes/base/jquery.ui.base.css" rel="stylesheet" /> - <link type="text/css" href="testsuite.css" rel="stylesheet" /> + <link rel="stylesheet" href="../../external/qunit.css" type="text/css"/> + <style type="text/css"> + ul { font-family: 'trebuchet ms', verdana, arial; } + h2, ul {font-size: 10pt; } + h2 { + background-color:#EEEEEE; + color:black; + font-size:small; + font-weight:normal; + margin:0; + padding:10px; + } + </style> <script type="text/javascript" src="../../jquery-1.4.2.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> @@ -30,7 +42,7 @@ </head> <body> -<h1>jQuery UI Unit Tests</h1> +<h1 id="qunit-header">jQuery UI Unit Tests</h1> <h2>Core</h2> <ul> diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html index 421cd5fa0..0dc6c671c 100644 --- a/tests/unit/position/position.html +++ b/tests/unit/position/position.html @@ -6,15 +6,22 @@ <script type="text/javascript" src="../../../jquery-1.4.2.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.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="position_core.js"></script> </head> <body> -<div id="main" style="top: 0; left: 0;"> +<h1 id="qunit-header">jQuery UI Position 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: 0; left: 0;"> <div id="el1" style="position: absolute; width: 6px; height: 6px;"></div> <div id="el2" style="position: absolute; width: 6px; height: 6px;"></div> <div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px;"></div> diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js index 705a7ec34..4d2716ced 100644 --- a/tests/unit/position/position_core.js +++ b/tests/unit/position/position_core.js @@ -86,7 +86,7 @@ test('positions', function() { of: '#parent', collision: 'none' }); - same(el.offset(), definition.result, "Position via " + jsDump.parse({my:definition.my, at:definition.at})); + same(el.offset(), definition.result, "Position via " + QUnit.jsDump.parse({my:definition.my, at:definition.at})); }); }); diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html index 87443073b..b30f047a7 100644 --- a/tests/unit/progressbar/progressbar.html +++ b/tests/unit/progressbar/progressbar.html @@ -3,13 +3,15 @@ <head> <title>jQuery UI Progressbar Test Suite</title> + <link type="text/css" href="../../../themes/base/jquery.ui.progressbar.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> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.progressbar.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> @@ -22,7 +24,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Progressbar 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 id="progressbar"></div> </div> diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html index 9850acc86..727594ac3 100644 --- a/tests/unit/resizable/resizable.html +++ b/tests/unit/resizable/resizable.html @@ -3,14 +3,16 @@ <head> <title>jQuery UI Resizable Test Suite</title> + <link type="text/css" href="../../../themes/base/jquery.ui.resizable.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> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.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> @@ -23,7 +25,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Resizable 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 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;"/> </div> diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html index 8ee88f719..a11ae7552 100644 --- a/tests/unit/selectable/selectable.html +++ b/tests/unit/selectable/selectable.html @@ -9,8 +9,8 @@ <script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.selectable.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> @@ -23,7 +23,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Selectable 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;"> <ul id="selectable1"> <li>Item 1</li> <li>Item 2</li> diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html index 5cbc9185f..665834a0c 100644 --- a/tests/unit/slider/slider.html +++ b/tests/unit/slider/slider.html @@ -3,14 +3,16 @@ <head> <title>jQuery UI Slider Test Suite</title> + <link type="text/css" href="../../../themes/base/jquery.ui.slider.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> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.slider.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> @@ -23,7 +25,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Slider 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 id="slider1"></div> <div id="slider3" style="position: relative; margin: 40px; width: 217px; height: 28px;"> <div class="ui-slider-handle" style="position: absolute; height: 21px; left: 0px; bottom: 0px; width: 17px;"></div> diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html index 0076a1e75..5f4cb3d9c 100644 --- a/tests/unit/sortable/sortable.html +++ b/tests/unit/sortable/sortable.html @@ -9,8 +9,8 @@ <script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.sortable.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> @@ -23,7 +23,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Sortable 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;"> <ul id="sortable"> <li>Item 1</li> <li>Item 2</li> diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html index adb22cf72..2497f0b24 100644 --- a/tests/unit/tabs/tabs.html +++ b/tests/unit/tabs/tabs.html @@ -3,14 +3,16 @@ <head> <title>jQuery UI Tabs Test Suite</title> + <link type="text/css" href="../../../themes/base/jquery.ui.tabs.css" rel="stylesheet" /> + <script type="text/javascript" src="../../../jquery-1.4.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.cookie.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.tabs.js"></script> - <link type="text/css" href="../testsuite.css" rel="stylesheet" /> - <script type="text/javascript" src="../../../external/testrunner-r6588.js"></script> - <script type="text/javascript" src="../../../external/jquery.cookie.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> @@ -22,7 +24,15 @@ <script type="text/javascript" src="tabs_tickets.js"></script> </head> <body> - <div id="main"> + +<h1 id="qunit-header">jQuery UI Tabs 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 id="tabs1"> <ul> <li><a href="#fragment-1"><span>1</span></a></li> diff --git a/tests/unit/testsuite.css b/tests/unit/testsuite.css deleted file mode 100644 index 524a03087..000000000 --- a/tests/unit/testsuite.css +++ /dev/null @@ -1,4 +0,0 @@ -@import "../../external/testsuite-r6565.css"; -html { border: 0; } -.xerror, .error, .ui-tabs-hide { display: none } -#main { position: absolute; top: -10000px; left: -10000px; } diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html index 674d30486..a2861494b 100644 --- a/tests/unit/widget/widget.html +++ b/tests/unit/widget/widget.html @@ -7,8 +7,8 @@ <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.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> @@ -16,7 +16,13 @@ </head> <body> -<div id="main"> +<h1 id="qunit-header">jQuery UI Widget 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> diff --git a/tests/visual/index.html b/tests/visual/index.html index 304a7ee2f..ec19b53f0 100644 --- a/tests/visual/index.html +++ b/tests/visual/index.html @@ -1,7 +1,7 @@ <!doctype html> <html lang="en"> <head> - <title>Visual Tests</title> + <title>jQuery UI Visual Tests</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" type="text/css" /> <script type="text/javascript" src="../../jquery-1.4.2.js"></script> <script type="text/javascript"> @@ -12,6 +12,8 @@ </head> <body> + +<h1>jQuery UI Visual Tests</h1> <h2>Interactions</h2> <ul> @@ -25,6 +27,7 @@ <h2>Widgets</h2> <ul> <li><a href="accordion/default.html">Accordion</a></li> + <li><a href="autocomplete/default.html">Autocomplete</a></li> <li><a href="button/default.html">Button</a></li> <li><a href="datepicker/default.html">Datepicker</a></li> <li><a href="dialog/default.html">Dialog</a></li> |