X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fattributes.js;h=21d3d94bcb96a23cc5ad952820537223ad89fdfc;hb=8effe3a7dee91c833cc1774646da9d743600c64c;hp=234d586220224675da4a9041a5972949eba439af;hpb=83a044f1b5a733dc7ea76dbc9b7dd3a3dc4b7f25;p=jquery.git

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 234d586..21d3d94 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -4,7 +4,7 @@ var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
 
 test("attr(String)", function() {
-	expect(28);
+	expect(30);
 
 	// This one sometimes fails randomly ?!
 	equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
@@ -61,6 +61,9 @@ test("attr(String)", function() {
 	select.appendChild( optgroup );
 
 	equals( jQuery(option).attr("selected"), true, "Make sure that a single option is selected, even when in an optgroup." );
+
+	ok( jQuery("<div/>").attr("doesntexist") === undefined, "Make sure undefined is returned when no attribute is found." );
+	ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );
 });
 
 if ( !isLocal ) {
@@ -435,7 +438,7 @@ test("val(Function) with incoming value", function() {
 });
 
 var testAddClass = function(valueObj) {
-	expect(4);
+	expect(5);
 	var div = jQuery("div");
 	div.addClass( valueObj("test") );
 	var pass = true;
@@ -457,6 +460,10 @@ var testAddClass = function(valueObj) {
 	div.attr("class", " foo");
 	div.addClass( valueObj("test") );
 	equals( div.attr("class"), "foo test", "Make sure there's no extra whitespace." );
+
+	div.attr("class", "foo");
+	div.addClass( valueObj("bar baz") );
+	equals( div.attr("class"), "foo bar baz", "Make sure there isn't too much trimming." );
 };
 
 test("addClass(String)", function() {
@@ -475,8 +482,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;
@@ -546,8 +555,10 @@ 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" );