Button: Test fixup

Author: arschmitz

tests/unit/button/button_core.js

@@ -3,7 +3,6 @@
  */
 
 (function($) {
-
 module( "Button: core" );
 
 test( "Input type submit, don't create child elements", function() {

tests/unit/button/button_core_deprecated.js

@@ -15,7 +15,7 @@ test( "Calling button on a checkbox input calls checkboxradio widget", function(
 
 	equal( checkbox.is( ":ui-checkboxradio" ), true,
 		"Calling button on a checkbox creats checkboxradio instance" );
-	equal( checkbox.checkboxradio( "option", "icon" ), false,
+	strictEqual( checkbox.checkboxradio( "option", "icon" ), false,
 		"Calling button on a checkbox sets the checkboxradio icon option to false" );
 });
 test( "Calling buttonset calls controlgroup", function(){
@@ -25,6 +25,6 @@ test( "Calling buttonset calls controlgroup", function(){
 	controlgroup.buttonset();
 
 	equal( controlgroup.is( ":ui-controlgroup" ), true,
-		"Calling buttonset creats controlgroup instance" );
+		"Calling buttonset creates controlgroup instance" );
 });
 })(jQuery);

tests/unit/button/button_methods.js

@@ -18,11 +18,13 @@ test( "refresh: Ensure disabled state is preserved correctly.", function() {
 
 	var element = $( "<a href='#'></a>" );
 	element.button({ disabled: true }).button( "refresh" );
-	ok( element.button( "option", "disabled" ), "Anchor button should remain disabled after refresh" ); //See #8237
+	ok( element.button( "option", "disabled" ),
+		"Anchor button should remain disabled after refresh" );
 
 	element = $( "<div></div>" );
 	element.button({ disabled: true }).button( "refresh" );
-	ok( element.button( "option", "disabled" ), "<div> buttons should remain disabled after refresh" );
+	ok( element.button( "option", "disabled" ),
+		"<div> buttons should remain disabled after refresh" );
 
 	element = $( "<button></button>" );
 	element.button( { disabled: true} ).button( "refresh" );
@@ -31,7 +33,8 @@ test( "refresh: Ensure disabled state is preserved correctly.", function() {
 
 	element = $( "<button></button>" );
 	element.button( { disabled: true} ).prop( "disabled", false ).button( "refresh" );
-	ok( !element.button( "option", "disabled" ), "Changing a <button>'s disabled property should update the state after refresh."); //See #8828
+	ok( !element.button( "option", "disabled" ),
+		"Changing a <button>'s disabled property should update the state after refresh.");
 
 });
 

tests/unit/button/button_options.js

@@ -10,7 +10,7 @@ test( "disabled, explicit value", function() {
 
 	var element = $( "#button" ).button({ disabled: false });
 	deepEqual( element.button( "option", "disabled" ), false, "disabled option set to false" );
-	deepEqual( element.prop( "disabled" ), false, "element is disabled" );
+	deepEqual( element.prop( "disabled" ), false, "Disabled property is false" );
 
 	ok( !element.button( "widget" ).hasClass( "ui-state-disabled" ), "element gets ui-state-disabled" );
 	ok( !element.button( "widget" ).hasClass( "ui-button-disabled" ), "element gets ui-button-disabled" );
@@ -22,9 +22,11 @@ test( "disabled, explicit value", function() {
 	ok( element.button( "widget" ).hasClass( "ui-button-disabled" ), "element gets ui-button-disabled" );
 
 	deepEqual( element.button( "option", "disabled" ), true, "disabled option set to true" );
-	deepEqual( element.prop( "disabled" ), true, "element is not disabled" );
+	deepEqual( element.prop( "disabled" ), true, "Disabled property is set" );
 });
 
+// We are testing the default here because the default null is a special value which means to check
+// the DOM, so we need to make sure this happens correctly
 test( "disabled, null", function() {
 	expect( 2 );
 	$( "#button" ).button({ disabled: null });
@@ -33,18 +35,20 @@ test( "disabled, null", function() {
 	strictEqual( $("#button").prop("disabled"), false, "element is disabled");
 });
 
-test( "showLabel false without icon", function() {
+test( "showLabel, false, without icon", function() {
 	expect( 1 );
-	$( "#button" ).button({
+
+	var button = $( "#button" )
+	button.button({
 		showLabel: false
 	});
-	strictEqual( $( "#button" ).is( ":ui-button.ui-corner-all.ui-widget" ), true,
+	strictEqual( button.is( ":ui-button.ui-corner-all.ui-widget" ), true,
 		"Button has correct classes" );
 
-	$( "#button" ).button( "destroy" );
+	button.button( "destroy" );
 });
 
-test("showLabel false with icon", function() {
+test( "showLabel, false, with icon", function() {
 	expect( 1 );
 	$("#button").button({
 		showLabel: false,
@@ -64,7 +68,7 @@ test( "label, default", function() {
 	$( "#button" ).button( "destroy" );
 });
 
-test( "label", function() {
+test( "label, explicit value", function() {
 	expect( 2 );
 	$( "#button" ).button({
 		label: "xxx"
@@ -75,13 +79,13 @@ test( "label", function() {
 	$( "#button" ).button( "destroy" );
 });
 
-test( "label default with input type submit", function() {
+test( "label, default, with input type submit", function() {
 	expect( 2 );
 	deepEqual( $( "#submit" ).button().val(), "Label" );
 	deepEqual( $( "#submit" ).button( "option", "label" ), "Label" );
 });
 
-test( "label with input type submit", function() {
+test( "label, explicit value, with input type submit", function() {
 	expect( 2 );
 	var label = $( "#submit" ).button({
 		label: "xxx"
@@ -90,7 +94,7 @@ test( "label with input type submit", function() {
 	deepEqual( $( "#submit" ).button( "option", "label" ), "xxx" );
 });
 
-test( "icons", function() {
+test( "icon", function() {
 	expect( 1 );
 	$("#button").button({
 		showLabel: false,