X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fattributes.js;h=8ce1c73a6dbf3c3d4ae4d337244cc1a21512a0f7;hb=1bdcffba8ed6777ffc451523a34ade142715fd94;hp=d7abbad359b8c524566f5eeb55f306be1b4b1032;hpb=437ddb931df29c0b46ffb893165e15f159963085;p=jquery.git

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index d7abbad..8ce1c73 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -150,7 +150,7 @@ test("attr(String, Object)", function() {
 	equals( j.attr("name"), "attrvalue", "Check node,textnode,comment for attr" );
 	j.removeAttr("name");
 
-	reset();
+	QUnit.reset();
 
 	var type = jQuery("#check2").attr('type');
 	var thrown = false;
@@ -306,7 +306,7 @@ test("val()", function() {
 	document.getElementById('text1').value = "bla";
 	equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
 
-	reset();
+	QUnit.reset();
 
 	equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
 	// ticket #1714 this caused a JS error in IE
@@ -328,10 +328,7 @@ test("val()", function() {
 	jQuery('#select3').val("");
 	same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' );
 
-	var checks = jQuery("<input type='checkbox' name='test' value='1'/>").appendTo("#form")
-		.add( jQuery("<input type='checkbox' name='test' value='2'/>").appendTo("#form") )
-		.add( jQuery("<input type='checkbox' name='test' value=''/>").appendTo("#form") )
-		.add( jQuery("<input type='checkbox' name='test'/>").appendTo("#form") );
+	var checks = jQuery("<input type='checkbox' name='test' value='1'/><input type='checkbox' name='test' value='2'/><input type='checkbox' name='test' value=''/><input type='checkbox' name='test'/>").appendTo("#form");
 
 	same( checks.serialize(), "", "Get unchecked values." );
 
@@ -482,8 +479,10 @@ test("addClass(Function) with incoming value", function() {
 	});
 
 	div.addClass(function(i, val) {
-		equals( val, old[i], "Make sure the incoming value is correct." );
-		return "test";
+		if ( this.id !== "_firebugConsole" ) {
+			equals( val, old[i], "Make sure the incoming value is correct." );
+			return "test";
+		}
 	});
 
 	var pass = true;
@@ -502,7 +501,7 @@ var testRemoveClass = function(valueObj) {
 
 	ok( !$divs.is('.test'), "Remove Class" );
 
-	reset();
+	QUnit.reset();
 	$divs = jQuery('div');
 
 	$divs.addClass("test").addClass("foo").addClass("bar");
@@ -510,7 +509,7 @@ var testRemoveClass = function(valueObj) {
 
 	ok( !$divs.is('.test,.bar,.foo'), "Remove multiple classes" );
 
-	reset();
+	QUnit.reset();
 	$divs = jQuery('div');
 
 	// Make sure that a null value doesn't cause problems
@@ -553,13 +552,15 @@ test("removeClass(Function) with incoming value", function() {
 	});
 
 	$divs.removeClass(function(i, val) {
-		equals( val, old[i], "Make sure the incoming value is correct." );
-		return "test";
+		if ( this.id !== "_firebugConsole" ) {
+			equals( val, old[i], "Make sure the incoming value is correct." );
+			return "test";
+		}
 	});
 
 	ok( !$divs.is('.test'), "Remove Class" );
 
-	reset();	
+	QUnit.reset();	
 });
 
 var testToggleClass = function(valueObj) {