X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdimensions.js;h=f365f928925615c500ce94c50113a6e60dbf0dbf;hb=1052792bb23b56d25dcbacd3816c8b5a08bc9b72;hp=af35850f5cbac7b323b76e493279e7208bd4f6b7;hpb=aea452f1624df811c8b0b2916bfb22213d153f9d;p=jquery.git

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index af35850..f365f92 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -1,9 +1,65 @@
 module("dimensions");
 
+test("width()", function() {
+	expect(6);
+
+	var $div = jQuery("#nothiddendiv");
+	$div.width(30);
+	equals($div.width(), 30, "Test set to 30 correctly");
+	$div.hide();
+	equals($div.width(), 30, "Test hidden div");
+	$div.show();
+	$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");
+	//DISABLED - Opera 9.6 fails this test, returns 8
+	//equals($div.width(), 30, "Test border specified with ems");
+	//$div.css("padding", "2%");
+	//equals($div.width(), 30, "Test padding specified with percent");
+
+	$div.css({ display: "", border: "", padding: "" });
+
+	jQuery("#nothiddendivchild").css({ padding: "3px", border: "2px solid #fff" });
+	equals(jQuery("#nothiddendivchild").width(), 20, "Test child width with border and padding");
+	jQuery("#nothiddendiv, #nothiddendivchild").css({ border: "", padding: "", width: "" });
+});
+
+test("height()", function() {
+	expect(5);
+
+	var $div = jQuery("#nothiddendiv");
+	$div.height(30);
+	equals($div.height(), 30, "Test set to 30 correctly");
+	$div.hide();
+	equals($div.height(), 30, "Test hidden div");
+	$div.show();
+	$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");
+	//DISABLED - Opera 9.6 fails this test, returns 8
+	//equals($div.height(), 30, "Test border specified with ems");
+	//$div.css("padding", "2%");
+	//equals($div.height(), 30, "Test padding specified with percent");
+
+	$div.css({ display: "", border: "", padding: "", height: "1px" });
+});
+
 test("innerWidth()", function() {
 	expect(3);
 
-	var $div = $("#nothiddendiv");
+	var $div = jQuery("#nothiddendiv");
 	// set styles
 	$div.css({
 		margin: 10,
@@ -24,7 +80,7 @@ test("innerWidth()", function() {
 test("innerHeight()", function() {
 	expect(3);
 	
-	var $div = $("#nothiddendiv");
+	var $div = jQuery("#nothiddendiv");
 	// set styles
 	$div.css({
 		margin: 10,
@@ -45,7 +101,7 @@ test("innerHeight()", function() {
 test("outerWidth()", function() {
 	expect(6);
 	
-	var $div = $("#nothiddendiv");
+	var $div = jQuery("#nothiddendiv");
 	$div.css("width", 30);
 	
 	equals($div.outerWidth(), 30, "Test with only width set");
@@ -55,18 +111,19 @@ test("outerWidth()", function() {
 	equals($div.outerWidth(), 74, "Test with padding and border");
 	$div.css("margin", "10px");
 	equals($div.outerWidth(), 74, "Test with padding, border and margin without margin option");
+	$div.css("position", "absolute");
 	equals($div.outerWidth(true), 94, "Test with padding, border and margin with margin option");
 	$div.hide();
 	equals($div.outerWidth(true), 94, "Test hidden div with padding, border and margin with margin option");
 	
 	// reset styles
-	$div.css({ display: "", border: "", padding: "", width: "", height: "" });
+	$div.css({ position: "", display: "", border: "", padding: "", width: "", height: "" });
 });
 
 test("outerHeight()", function() {
 	expect(6);
 	
-	var $div = $("#nothiddendiv");
+	var $div = jQuery("#nothiddendiv");
 	$div.css("height", 30);
 	
 	equals($div.outerHeight(), 30, "Test with only width set");