X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdimensions.js;h=92cf17b7d876c4cdc80660c135259fea46a76931;hb=8d04ffec16790cbfb04b42421e0ac18600625374;hp=aac1655f5175959b21f5624f46f9dcf46fbbafcf;hpb=bf802496c6b1055222814e8cd5185c023eadf202;p=jquery.git

diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index aac1655..92cf17b 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -1,9 +1,111 @@
 module("dimensions");
 
+function pass( val ) {
+	return val;
+}
+
+function fn( val ) {
+	return function(){ return val; };
+}
+
+function testWidth( val ) {
+	expect(8);
+
+	var $div = jQuery("#nothiddendiv");
+	$div.width( val(30) );
+	equals($div.width(), 30, "Test set to 30 correctly");
+	$div.hide();
+	equals($div.width(), 30, "Test hidden div");
+	$div.show();
+	$div.width( val(-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({ display: "", border: "", padding: "" });
+
+	jQuery("#nothiddendivchild").css({ width: 20, 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: "" });
+
+	var blah = jQuery("blah");
+	equals( blah.width( val(10) ), blah, "Make sure that setting a width on an empty set returns the set." );
+	equals( blah.width(), null, "Make sure 'null' is returned on an empty set");
+}
+
+test("width()", function() {
+	testWidth( pass );
+});
+
+test("width() with function", function() {
+	testWidth( fn );
+});
+
+test("width() with function args", function() {
+	expect( 2 );
+	
+	var $div = jQuery("#nothiddendiv");
+	$div.width( 30 ).width(function(i, width) {
+		equals( width, 30, "Make sure previous value is corrrect." );
+		return width + 1;
+	});
+	
+	equals( $div.width(), 31, "Make sure value was modified correctly." );
+});
+
+function testHeight( val ) {
+	expect(8);
+
+	var $div = jQuery("#nothiddendiv");
+	$div.height( val(30) );
+	equals($div.height(), 30, "Test set to 30 correctly");
+	$div.hide();
+	equals($div.height(), 30, "Test hidden div");
+	$div.show();
+	$div.height( val(-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({ display: "", border: "", padding: "", height: "1px" });
+
+	jQuery("#nothiddendivchild").css({ height: 20, padding: "3px", border: "2px solid #fff" });
+	equals(jQuery("#nothiddendivchild").height(), 20, "Test child height with border and padding");
+	jQuery("#nothiddendiv, #nothiddendivchild").css({ border: "", padding: "", height: "" });
+
+	var blah = jQuery("blah");
+	equals( blah.height( val(10) ), blah, "Make sure that setting a height on an empty set returns the set." );
+	equals( blah.height(), null, "Make sure 'null' is returned on an empty set");
+}
+
+test("height()", function() {
+	testHeight( pass );
+});
+
+test("height() with function", function() {
+	testHeight( fn );
+});
+
+test("height() with function args", function() {
+	expect( 2 );
+	
+	var $div = jQuery("#nothiddendiv");
+	$div.height( 30 ).height(function(i, height) {
+		equals( height, 30, "Make sure previous value is corrrect." );
+		return height + 1;
+	});
+	
+	equals( $div.height(), 31, "Make sure value was modified correctly." );
+});
+
 test("innerWidth()", function() {
 	expect(3);
 
-	var $div = $("#nothiddendiv");
+	var $div = jQuery("#nothiddendiv");
 	// set styles
 	$div.css({
 		margin: 10,
@@ -24,7 +126,7 @@ test("innerWidth()", function() {
 test("innerHeight()", function() {
 	expect(3);
 	
-	var $div = $("#nothiddendiv");
+	var $div = jQuery("#nothiddendiv");
 	// set styles
 	$div.css({
 		margin: 10,
@@ -45,7 +147,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");
@@ -67,7 +169,7 @@ test("outerWidth()", function() {
 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");
@@ -83,4 +185,4 @@ test("outerHeight()", function() {
 	
 	// reset styles
 	$div.css({ display: "", border: "", padding: "", width: "", height: "" });
-});
\ No newline at end of file
+});