Merge branch 'master' into selectmenu

1 files changed, 28 insertions, 0 deletions

diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 03822fd74..479aab0d1 100644
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -5,6 +5,34 @@
 
 module("menu: options");
 
+test( "{ disabled: true }", function() {
+	expect( 2 );
+	var menu = $( "#menu1" ).menu({
+		disabled: true,
+		select: function(event, ui) {
+			menu_log();
+		}
+	});
+	ok(menu.is(".ui-state-disabled"),"Missing ui-state-disabled class");
+	menu_log("click",true);
+	menu_click(menu,"1");
+	menu_log("afterclick");
+	equals( $("#log").html(), "afterclick,click,", "Click order not valid.");
+});
 
+test( "{ disabled: false }", function() {
+	expect( 2 );
+	var menu = $( "#menu1" ).menu({
+		disabled: false,
+		select: function(event, ui) {
+			menu_log();
+		}
+	});
+	ok(menu.not(".ui-state-disabled"),"Has ui-state-disabled class");
+	menu_log("click",true);
+	menu_click(menu,"1");
+	menu_log("afterclick");
+	equals( $("#log").html(), "afterclick,1,click,", "Click order not valid.");
+});
 
 })(jQuery);