diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/autocomplete/autocomplete_defaults.js | 7 | ||||
| -rw-r--r-- | tests/unit/dialog/dialog_options.js | 48 | ||||
| -rw-r--r-- | tests/unit/draggable/draggable_options.js | 4 | ||||
| -rw-r--r-- | tests/unit/tabs/tabs.html | 3 | ||||
| -rw-r--r-- | tests/unit/tabs/tabs_methods.js | 11 | ||||
| -rw-r--r-- | tests/unit/widget/widget.html | 3 | ||||
| -rw-r--r-- | tests/unit/widget/widget_core.js (renamed from tests/unit/widget/widget.js) | 0 | ||||
| -rw-r--r-- | tests/unit/widget/widget_tickets.js | 46 | ||||
| -rw-r--r-- | tests/visual/button/button_performance.html | 3 | ||||
| -rw-r--r-- | tests/visual/menu/drilldown.html | 2 | ||||
| -rw-r--r-- | tests/visual/menu/menu.html | 2 |
11 files changed, 88 insertions, 41 deletions
diff --git a/tests/unit/autocomplete/autocomplete_defaults.js b/tests/unit/autocomplete/autocomplete_defaults.js index c6017d62c..8dad15e8f 100644 --- a/tests/unit/autocomplete/autocomplete_defaults.js +++ b/tests/unit/autocomplete/autocomplete_defaults.js @@ -6,7 +6,12 @@ var autocomplete_defaults = { delay: 300, disabled: false, minLength: 1, - source: undefined + position: { + my: "left top", + at: "left bottom", + collision: "none" + }, + source: null }; commonWidgetTests('autocomplete', { defaults: autocomplete_defaults }); diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js index b5eda1fcf..cda16aadc 100644 --- a/tests/unit/dialog/dialog_options.js +++ b/tests/unit/dialog/dialog_options.js @@ -242,8 +242,8 @@ test("modal", function() { test("position, default center on window", function() { var el = $('<div></div>').dialog(); - var offset = el.parent().offset(); - // use .position() instead to avoid replicating center-logic? + var dialog = el.dialog('widget'); + var offset = dialog.offset(); same(offset.left, Math.floor($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft()); same(offset.top, Math.floor($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop()); el.remove(); @@ -251,16 +251,16 @@ test("position, default center on window", function() { test("position, top on window", function() { var el = $('<div></div>').dialog({ position: "top" }); - var dialog = el.closest('.ui-dialog'); + var dialog = el.dialog('widget'); var offset = dialog.offset(); - same(offset.left, Math.floor($(window).width() / 2 - dialog.outerWidth() / 2)); + same(offset.left, Math.floor($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft()); same(offset.top, $(window).scrollTop()); el.remove(); }); test("position, left on window", function() { var el = $('<div></div>').dialog({ position: "left" }); - var dialog = el.closest('.ui-dialog'); + var dialog = el.dialog('widget'); var offset = dialog.offset(); same(offset.left, 0); same(offset.top, Math.floor($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop()); @@ -269,27 +269,27 @@ test("position, left on window", function() { test("position, right bottom on window", function() { var el = $('<div></div>').dialog({ position: "right bottom" }); - var dialog = el.closest('.ui-dialog'); + var dialog = el.dialog('widget'); var offset = dialog.offset(); - same(offset.left, $(window).width() - dialog.outerWidth()); + same(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft()); same(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop()); el.remove(); }); test("position, right bottom on window w/array", function() { var el = $('<div></div>').dialog({ position: ["right", "bottom"] }); - var dialog = el.closest('.ui-dialog'); + var dialog = el.dialog('widget'); var offset = dialog.offset(); - same(offset.left, $(window).width() - dialog.outerWidth()); + same(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft()); same(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop()); el.remove(); }); test("position, offset from top left w/array", function() { var el = $('<div></div>').dialog({ position: [10, 10] }); - var dialog = el.closest('.ui-dialog'); + var dialog = el.dialog('widget'); var offset = dialog.offset(); - same(offset.left, 10); + same(offset.left, 10 + $(window).scrollLeft()); same(offset.top, 10 + $(window).scrollTop()); el.remove(); }); @@ -302,10 +302,10 @@ test("position, right bottom at right bottom via ui.position args", function() { } }); - var dialog = el.closest('.ui-dialog'); + var dialog = el.dialog('widget'); var offset = dialog.offset(); - same(offset.left, $(window).width() - dialog.outerWidth()); + same(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft()); same(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop()); el.remove(); }); @@ -317,22 +317,21 @@ test("position, at another element", function() { left: 600, height: 10, width: 10 - }); + }).appendTo('body'); var el = $('<div></div>').dialog({ position: { my: "left top", - at: "top left", + at: "left top", of: parent } }); - var dialog = el.closest('.ui-dialog'); + var dialog = el.dialog('widget'); var offset = dialog.offset(); - var parentOffset = parent.offset(); - same(offset.left, parentOffset.left); - same(offset.top, parentOffset.top); + same(offset.left, 600); + same(offset.top, 400); el.dialog('option', 'position', { my: "left top", @@ -340,18 +339,15 @@ test("position, at another element", function() { of: parent }); - same(offset.left, parentOffset.left + parent.outerWidth()); - same(offset.top, parentOffset.top + parent.outerHeight()); + var offset = dialog.offset(); + + same(offset.left, 610); + same(offset.top, 410); el.remove(); parent.remove(); }); - -test("position, others", function() { - ok(false, 'missing test - untested code is broken code'); -}); - test("resizable", function() { expect(4); diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index 78f6c563e..8ba77fb93 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -202,6 +202,10 @@ test("{ containment: Selector }", function() { ok(false, 'missing test - untested code is broken code'); }); +test("{ containment: [x1, y1, x2, y2] }", function() { + ok(false, 'missing test - untested code is broken code'); +}); + test("{ cursor: 'auto' }, default", function() { equals(draggable_defaults.cursor, 'auto'); diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html index 269f47ed5..211237569 100644 --- a/tests/unit/tabs/tabs.html +++ b/tests/unit/tabs/tabs.html @@ -15,7 +15,8 @@ <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="tabs_core.js"></script> <script type="text/javascript" src="tabs_defaults.js"></script> <script type="text/javascript" src="tabs_events.js"></script> diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js index 3eb627830..3812c3e91 100644 --- a/tests/unit/tabs/tabs_methods.js +++ b/tests/unit/tabs/tabs_methods.js @@ -97,7 +97,7 @@ test('remove', function() { }); test('select', function() { - expect(9); + expect(6); el = $('#tabs1').tabs(); @@ -115,20 +115,11 @@ test('select', function() { equals(el.tabs('option', 'selected'), -1, 'should collapse tab passing in -1'); el.tabs('destroy'); - el.tabs({ collapsible: true }); - el.tabs('select', null); - equals(el.tabs('option', 'selected'), -1, 'should collapse tab passing in null (deprecated)'); - el.tabs('select', null); - equals(el.tabs('option', 'selected'), -1, 'should not select tab passing in null a second time (deprecated)'); - - el.tabs('destroy'); el.tabs(); el.tabs('select', 0); equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true'); el.tabs('select', -1); equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true'); - el.tabs('select', null); - equals(el.tabs('option', 'selected'), 0, 'should not collapse tab if collapsible is not set to true'); el.tabs('select', '#fragment-2'); equals(el.tabs('option', 'selected'), 1, 'should select tab by id'); diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html index c3c3b0875..9e02880c4 100644 --- a/tests/unit/widget/widget.html +++ b/tests/unit/widget/widget.html @@ -13,7 +13,8 @@ <script type="text/javascript" src="../../jquery.simulate.js"></script> <script type="text/javascript" src="../testsuite.js"></script> - <script type="text/javascript" src="widget.js"></script> + <script type="text/javascript" src="widget_core.js"></script> + <script type="text/javascript" src="widget_tickets.js"></script> </head> <body> diff --git a/tests/unit/widget/widget.js b/tests/unit/widget/widget_core.js index 3c870f1fe..3c870f1fe 100644 --- a/tests/unit/widget/widget.js +++ b/tests/unit/widget/widget_core.js diff --git a/tests/unit/widget/widget_tickets.js b/tests/unit/widget/widget_tickets.js new file mode 100644 index 000000000..47303dc9c --- /dev/null +++ b/tests/unit/widget/widget_tickets.js @@ -0,0 +1,46 @@ +/* + * widget unit tests + */ +(function($) { + +module('widget: tickets'); + +test('#5830 - Widget: Using inheritance overwrites the base classes options', function() { + $.widget( "ui.testWidgetBase", { + options: { + obj: { + key1: "foo", + key2: "bar" + }, + arr: [ "testing" ] + } + }); + + $.widget( "ui.testWidgetExtension", $.ui.testWidgetBase, { + options: { + obj: { + key1: "baz" + }, + arr: [ "alpha", "beta" ] + } + }); + + same( $.ui.testWidgetBase.prototype.options.obj, { + key1: "foo", + key2: "bar" + }, "base class option object not overridden"); + same( $.ui.testWidgetBase.prototype.options.arr, [ "testing" ], + "base class option array not overridden"); + + same( $.ui.testWidgetExtension.prototype.options.obj, { + key1: "baz", + key2: "bar" + }, "extension class option object extends base"); + same( $.ui.testWidgetExtension.prototype.options.arr, [ "alpha", "beta" ], + "extension class option array overwrites base"); + + delete $.ui.testWidgetBase; + delete $.ui.testWidgetExtension; +}); + +})(jQuery); diff --git a/tests/visual/button/button_performance.html b/tests/visual/button/button_performance.html index 2d31c2f27..2785580a9 100644 --- a/tests/visual/button/button_performance.html +++ b/tests/visual/button/button_performance.html @@ -16,7 +16,10 @@ <script type="text/javascript" src="../../../ui/jquery.ui.button.js"></script> <script type="text/javascript"> $(function() { + var start = +new Date(); $("button").button(); + var end = +new Date(); + $("<p></p>").text( "Time to initialize: " + (end - start) + "ms" ).prependTo("body"); }); </script> </head> diff --git a/tests/visual/menu/drilldown.html b/tests/visual/menu/drilldown.html index 1539045f0..d9c658209 100644 --- a/tests/visual/menu/drilldown.html +++ b/tests/visual/menu/drilldown.html @@ -250,7 +250,7 @@ <a href="#">Go back</a> </div> -<div class="ui-widget" style="margin-top:2em; font-family:Arial"> +<div class="ui-widget" style="clear: left; margin-top:2em; font-family:Arial"> Log: <div id="log" style="height: 400px; width: 300px; overflow: auto;" class="ui-widget-content"></div> </div> diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html index 93c33d4e2..d845acbe9 100644 --- a/tests/visual/menu/menu.html +++ b/tests/visual/menu/menu.html @@ -109,7 +109,7 @@ <li><a href="#">Amesville</a></li> </ul> -<div class="ui-widget" style="margin-top:2em; font-family:Arial"> +<div class="ui-widget" style="clear: left; margin-top:2em; font-family:Arial"> Log: <div id="log" style="height: 400px; width: 300px; overflow: auto;" class="ui-widget-content"></div> </div> |