Skip to content

Commit e9a3531

Browse files
committed
Selectmenu: adjust and improve unit tests
1 parent c5efdda commit e9a3531

File tree

2 files changed

+30
-25
lines changed

2 files changed

+30
-25
lines changed

tests/unit/selectmenu/selectmenu_methods.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@ test( "open / close", function() {
1414
expect( 4 );
1515

1616
var element = $('#speed').selectmenu(),
17-
button = element.selectmenu("widget").parent(),
18-
menu = element.selectmenu("menuWidget").parent();
17+
menu = element.selectmenu("menuWidget");
1918

2019
element.selectmenu("open");
21-
ok( menu.is( ":visible" ), "menu visible" );
22-
equals( menu.find("ul").attr("aria-hidden"), "false", "menu aria-disabled" );
20+
ok( menu.is( ":visible" ), "open: menu visible" );
21+
equals( menu.attr("aria-hidden"), "false", "open: menu aria-disabled" );
2322

2423
element.selectmenu("close");
25-
ok( menu.is( ":hidden" ), "menu hidden" );
26-
equals( menu.find("ul").attr("aria-hidden"), "true", "menu aria-disabled" );
24+
ok( menu.is( ":hidden" ), "close: menu hidden" );
25+
equals( menu.attr("aria-hidden"), "true", "close: menu aria-disabled" );
2726
});
2827

2928

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,41 @@
11
(function ($) {
22

3-
module("selectmenu: options", {
4-
setup: function () {
5-
this.element = $("#speed").selectmenu();
6-
}
7-
});
3+
module("selectmenu: options");
84

95
test("appendTo another element", function () {
106
expect(2);
11-
12-
ok(this.element.selectmenu("option", "appendTo", "#qunit-fixture"), "appendTo accepts selector");
7+
8+
element = $("#speed").selectmenu();
9+
10+
ok(element.selectmenu("option", "appendTo", "#qunit-fixture"), "appendTo accepts selector");
1311
ok($("#qunit-fixture").find(".ui-selectmenu-menu").length, "selectmenu appendedTo other element");
1412
});
1513

1614

1715
test("dropdown: CSS styles", function () {
18-
expect(4);
16+
expect(2);
17+
18+
var element = $("#speed").selectmenu(),
19+
button = element.selectmenu("widget"),
20+
menu = element.selectmenu("menuWidget");
1921

20-
var button = this.element.selectmenu("widget").parent(),
21-
ul = this.element.selectmenu("menuWidget"),
22-
link = button.find("a");
22+
element.selectmenu("open");
23+
ok( button.hasClass("ui-corner-top") && !button.hasClass("ui-corner-all") && button.find("span.ui-icon").hasClass("ui-icon-triangle-1-s"), "button styles dropdown");
24+
ok( menu.hasClass("ui-corner-bottom") && !menu.hasClass("ui-corner-all"), "menu styles dropdown");
25+
});
26+
27+
test("pop-up: CSS styles", function () {
28+
expect(2);
2329

24-
this.element.selectmenu("open");
25-
ok( link.hasClass("ui-corner-top") && !link.hasClass("ui-corner-all"), "button styles dropdown");
26-
ok( ul.hasClass("ui-corner-bottom") && !ul.hasClass("ui-corner-all"), "menu styles dropdown");
30+
var element = $("#speed").selectmenu({
31+
dropdown: false
32+
}),
33+
button = element.selectmenu("widget"),
34+
menu = element.selectmenu("menuWidget");
2735

28-
this.element.selectmenu("close");
29-
this.element.selectmenu("option", "dropdown", false);
30-
this.element.selectmenu("open");
31-
ok( !link.hasClass("ui-corner-top") && link.hasClass("ui-corner-all"), "button styles pop-up");
32-
ok( !ul.hasClass("ui-corner-bottom") && ul.hasClass("ui-corner-all"), "menu styles pop-up");
36+
element.selectmenu("close");
37+
ok( !button.hasClass("ui-corner-top") && button.hasClass("ui-corner-all") && button.find("span.ui-icon").hasClass("ui-icon-triangle-2-n-s"), "button styles pop-up");
38+
ok( !menu.hasClass("ui-corner-bottom") && menu.hasClass("ui-corner-all"), "menu styles pop-up");
3339
});
3440

3541
})(jQuery);

0 commit comments

Comments
 (0)