X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=116312e3fa7819db9778112a832447650916c083;hb=66975de2d249643779e2b3daad0457f7f5f92508;hp=270638e62f2ec00fc1790ca5076dd3a30718b680;hpb=64e4a879f9f92053ac4d58a3fffc0bbff6900b6e;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index 270638e..116312e 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(27);
+	expect(30);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -12,6 +12,8 @@ test("css(String|Hash)", function() {
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
 
 	// handle negative numbers by ignoring #1599, #4216
+	jQuery('#nothiddendiv').css({ 'width': 1, 'height': 1 });
+
 	var width = parseFloat(jQuery('#nothiddendiv').css('width')), height = parseFloat(jQuery('#nothiddendiv').css('height'));
 	jQuery('#nothiddendiv').css({ width: -1, height: -1 });
 	equals( parseFloat(jQuery('#nothiddendiv').css('width')), width, 'Test negative width ignored')
@@ -42,23 +44,37 @@ test("css(String|Hash)", function() {
 	var div = jQuery('#nothiddendiv'), child = jQuery('#nothiddendivchild');
 
 	equals( parseInt(div.css("fontSize")), 16, "Verify fontSize px set." );
+	equals( parseInt(div.css("font-size")), 16, "Verify fontSize px set." );
 	equals( parseInt(child.css("fontSize")), 16, "Verify fontSize px set." );
+	equals( parseInt(child.css("font-size")), 16, "Verify fontSize px set." );
 
 	child.attr("class", "em");
 	equals( parseInt(child.css("fontSize")), 32, "Verify fontSize em set." );
 
+	// Have to verify this as the result depends upon the browser's CSS
+	// support for font-size percentages
 	child.attr("class", "prct");
-	equals( parseInt(child.css("fontSize")), 24, "Verify fontSize % set." );
+	var prctval = parseInt(child.css("fontSize")), checkval = 0;
+	if ( prctval === 16 || prctval === 24 ) {
+		checkval = prctval;
+	}
+
+	equals( prctval, checkval, "Verify fontSize % set." );
+
+	equals( typeof child.css("width"), "string", "Make sure that a string width is returned from css('width')." );
 });
 
 test("css(String, Object)", function() {
-	expect(20);
+	expect(21);
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
 	jQuery('#nothiddendiv').css("display", 'none');
 	ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden');
 	jQuery('#nothiddendiv').css("display", 'block');
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
 
+	jQuery("#nothiddendiv").css("top", "-1em");
+	ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." );
+
 	jQuery('#floatTest').css('styleFloat', 'left');
 	equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left');
 	jQuery('#floatTest').css('cssFloat', 'right');