X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=932d0a5e4ac880cbbea4a32a3b57ec9ffa597e61;hb=259c8aa6044491f41a19668c0283c4d339904ff0;hp=6b2c3fe33f43eb1107f75bbd8ca7f46c3c2888ab;hpb=24e036c7c88e7e3a1f878292e4b59914e1f4575c;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 6b2c3fe..932d0a5 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -473,12 +473,55 @@ test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", funct
 });
 
 test("width()", function() {
-	expect(2);
+	expect(9);
+
+	var $div = $("#nothiddendiv");
+	$div.width(30);
+	equals($div.width(), 30, "Test set to 30 correctly");
+	$div.width(-1); // handle negative numbers by ignoring #1599
+	equals($div.width(), 30, "Test negative width ignored");
+	$div.css("padding", "20px");
+	equals($div.width(), 30, "Test padding specified with pixels");
+	$div.css("border", "2px solid #fff");
+	equals($div.width(), 30, "Test border specified with pixels");
+	$div.css("padding", "2em");
+	equals($div.width(), 30, "Test padding specified with ems");
+	$div.css("border", "1em solid #fff");
+	equals($div.width(), 30, "Test border specified with ems");
+	$div.css("padding", "2%");
+	equals($div.width(), 30, "Test padding specified with percent");
+	$div.hide();
+	equals($div.width(), 30, "Test hidden div");
+	
+	$div.css({ display: "", border: "", padding: "" });
+	
+	$("#nothiddendivchild").css({ padding: "3px", border: "2px solid #fff" });
+	equals($("#nothiddendivchild").width(), 20, "Test child width with border and padding");
+	$("#nothiddendiv, #nothiddendivchild").css({ border: "", padding: "", width: "" });
+});
+
+test("height()", function() {
+	expect(8);
 
-	$("#nothiddendiv").width(30);
-	equals($("#nothiddendiv").width(), 30, "Test set to 30 correctly");
-	$("#nothiddendiv").width(-1); // handle negative numbers by ignoring #1599
-	equals($("#nothiddendiv").width(), 30, "Test negative width ignored");
+	var $div = $("#nothiddendiv");
+	$div.height(30);
+	equals($div.height(), 30, "Test set to 30 correctly");
+	$div.height(-1); // handle negative numbers by ignoring #1599
+	equals($div.height(), 30, "Test negative height ignored");
+	$div.css("padding", "20px");
+	equals($div.height(), 30, "Test padding specified with pixels");
+	$div.css("border", "2px solid #fff");
+	equals($div.height(), 30, "Test border specified with pixels");
+	$div.css("padding", "2em");
+	equals($div.height(), 30, "Test padding specified with ems");
+	$div.css("border", "1em solid #fff");
+	equals($div.height(), 30, "Test border specified with ems");
+	$div.css("padding", "2%");
+	equals($div.height(), 30, "Test padding specified with percent");
+	$div.hide();
+	equals($div.height(), 30, "Test hidden div");
+	
+	$div.css({ display: "", border: "", padding: "", height: "1px" });
 });
 
 test("text()", function() {
@@ -986,11 +1029,12 @@ test("$.extend(Object, Object)", function() {
 });
 
 test("val()", function() {
-	expect(3);
+	expect(4);
 	ok( $("#text1").val() == "Test", "Check for value of input element" );
 	ok( !$("#text1").val() == "", "Check for value of input element" );
 	// ticket #1714 this caused a JS error in IE
 	ok( $("#first").val() == "", "Check a paragraph element to see if it has a value" );
+	ok( $([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );
 });
 
 test("val(String)", function() {