X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fattributes.js;h=67dce1efaf1024a300799ac21d83e86d26ef313a;hb=aef1989ba74ee568f8bab3ac0967fd849816da12;hp=e6a30a1b8bf746866479249592d044504037f9f4;hpb=7c04a64016c1f295dfdf4e731f693f8400a987bc;p=jquery.git

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index e6a30a1..67dce1e 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -1,3 +1,5 @@
+module("attributes");
+
 test("attr(String)", function() {
 	expect(27);
 	equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
@@ -232,145 +234,6 @@ test("attr('tabindex', value)", function() {
 	equals(element.attr('tabindex'), -1, 'set negative tabindex');
 });
 
-test("css(String|Hash)", function() {
-	expect(19);
-
-	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
-
-	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('#floatTest').css({styleFloat: 'right'});
-	equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right');
-	jQuery('#floatTest').css({cssFloat: 'left'});
-	equals( jQuery('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left');
-	jQuery('#floatTest').css({'float': 'right'});
-	equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right');
-	jQuery('#floatTest').css({'font-size': '30px'});
-	equals( jQuery('#floatTest').css('font-size'), '30px', 'Modified CSS font-size: Assert font-size is 30px');
-
-	jQuery.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
-		jQuery('#foo').css({opacity: n});
-		equals( jQuery('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
-		jQuery('#foo').css({opacity: parseFloat(n)});
-		equals( jQuery('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
-	});
-	jQuery('#foo').css({opacity: ''});
-	equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when set to an empty String" );
-});
-
-test("css(String, Object)", function() {
-	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('#floatTest').css('styleFloat', 'left');
-	equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left');
-	jQuery('#floatTest').css('cssFloat', 'right');
-	equals( jQuery('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right');
-	jQuery('#floatTest').css('float', 'left');
-	equals( jQuery('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left');
-	jQuery('#floatTest').css('font-size', '20px');
-	equals( jQuery('#floatTest').css('font-size'), '20px', 'Modified CSS font-size: Assert font-size is 20px');
-
-	jQuery.each("0,0.25,0.5,0.75,1".split(','), function(i, n) {
-		jQuery('#foo').css('opacity', n);
-		equals( jQuery('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
-		jQuery('#foo').css('opacity', parseFloat(n));
-		equals( jQuery('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
-	});
-	jQuery('#foo').css('opacity', '');
-	equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when set to an empty String" );
-	// for #1438, IE throws JS error when filter exists but doesn't have opacity in it
-	if (jQuery.browser.msie) {
-		jQuery('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
-	}
-	equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
-
-	// using contents will get comments regular, text, and comment nodes
-	var j = jQuery("#nonnodes").contents();
-	j.css("padding-left", "1px");
-	equals( j.css("padding-left"), "1px", "Check node,textnode,comment css works" );
-
-	// opera sometimes doesn't update 'display' correctly, see #2037
-	jQuery("#t2037")[0].innerHTML = jQuery("#t2037")[0].innerHTML
-	equals( jQuery("#t2037 .hidden").css("display"), "none", "Make sure browser thinks it is hidden" );
-});
-
-test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
-	expect(4);
-
-	var $checkedtest = jQuery("#checkedtest");
-	// IE6 was clearing "checked" in jQuery.css(elem, "height");
-	jQuery.css($checkedtest[0], "height");
-	ok( !! jQuery(":radio:first", $checkedtest).attr("checked"), "Check first radio still checked." );
-	ok( ! jQuery(":radio:last", $checkedtest).attr("checked"), "Check last radio still NOT checked." );
-	ok( !! jQuery(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
-	ok( ! jQuery(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
-});
-
-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("addClass(String)", function() {
 	expect(2);
 	var div = jQuery("div");
@@ -455,4 +318,4 @@ test("jQuery.className", function() {
 	equals( x.className, "hi bar", "Check removal of one class" );
 	ok( c.has(x, "hi"), "Check has1" );
 	ok( c.has(x, "bar"), "Check has2" );
-});
\ No newline at end of file
+});