X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fdimensions.js;h=fa59a9f77b578f035b070c57b0daf57e34e8f3e0;hb=6c18a1becb59f1b2e64a4920967dc5cecdb296f6;hp=92cf17b7d876c4cdc80660c135259fea46a76931;hpb=8d04ffec16790cbfb04b42421e0ac18600625374;p=jquery.git
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 92cf17b..fa59a9f 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -1,4 +1,4 @@
-module("dimensions");
+module("dimensions", { teardown: moduleTeardown });
function pass( val ) {
return val;
@@ -33,6 +33,8 @@ function testWidth( val ) {
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");
+
+ jQuery.removeData($div[0], 'olddisplay', true);
}
test("width()", function() {
@@ -45,13 +47,13 @@ test("width() with function", function() {
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." );
});
@@ -80,6 +82,8 @@ function testHeight( val ) {
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");
+
+ jQuery.removeData($div[0], 'olddisplay', true);
}
test("height()", function() {
@@ -92,18 +96,18 @@ test("height() with function", function() {
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);
+ expect(4);
var $div = jQuery("#nothiddendiv");
// set styles
@@ -112,20 +116,28 @@ test("innerWidth()", function() {
border: "2px solid #fff",
width: 30
});
-
+
equals($div.innerWidth(), 30, "Test with margin and border");
$div.css("padding", "20px");
equals($div.innerWidth(), 70, "Test with margin, border and padding");
$div.hide();
equals($div.innerWidth(), 70, "Test hidden div");
-
+
// reset styles
$div.css({ display: "", border: "", padding: "", width: "", height: "" });
+
+ var div = jQuery( "
" );
+
+ // Temporarily require 0 for backwards compat - should be auto
+ equals( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );
+
+ div.remove();
+ jQuery.removeData($div[0], 'olddisplay', true);
});
test("innerHeight()", function() {
- expect(3);
-
+ expect(4);
+
var $div = jQuery("#nothiddendiv");
// set styles
$div.css({
@@ -133,23 +145,31 @@ test("innerHeight()", function() {
border: "2px solid #fff",
height: 30
});
-
+
equals($div.innerHeight(), 30, "Test with margin and border");
$div.css("padding", "20px");
equals($div.innerHeight(), 70, "Test with margin, border and padding");
$div.hide();
equals($div.innerHeight(), 70, "Test hidden div");
-
+
// reset styles
$div.css({ display: "", border: "", padding: "", width: "", height: "" });
+
+ var div = jQuery( "
" );
+
+ // Temporarily require 0 for backwards compat - should be auto
+ equals( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );
+
+ div.remove();
+ jQuery.removeData($div[0], 'olddisplay', true);
});
test("outerWidth()", function() {
- expect(6);
-
+ expect(7);
+
var $div = jQuery("#nothiddendiv");
$div.css("width", 30);
-
+
equals($div.outerWidth(), 30, "Test with only width set");
$div.css("padding", "20px");
equals($div.outerWidth(), 70, "Test with padding");
@@ -161,17 +181,25 @@ test("outerWidth()", function() {
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({ position: "", display: "", border: "", padding: "", width: "", height: "" });
+
+ var div = jQuery( "
" );
+
+ // Temporarily require 0 for backwards compat - should be auto
+ equals( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );
+
+ div.remove();
+ jQuery.removeData($div[0], 'olddisplay', true);
});
test("outerHeight()", function() {
- expect(6);
-
+ expect(7);
+
var $div = jQuery("#nothiddendiv");
$div.css("height", 30);
-
+
equals($div.outerHeight(), 30, "Test with only width set");
$div.css("padding", "20px");
equals($div.outerHeight(), 70, "Test with padding");
@@ -182,7 +210,15 @@ test("outerHeight()", function() {
equals($div.outerHeight(true), 94, "Test with padding, border and margin with margin option");
$div.hide();
equals($div.outerHeight(true), 94, "Test hidden div with padding, border and margin with margin option");
-
+
// reset styles
$div.css({ display: "", border: "", padding: "", width: "", height: "" });
+
+ var div = jQuery( "
" );
+
+ // Temporarily require 0 for backwards compat - should be auto
+ equals( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );
+
+ div.remove();
+ jQuery.removeData($div[0], 'olddisplay', true);
});