X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=1cd41a675f07dc8d3af3c57fef6e40d9b541ed35;hb=6dbffb8596a9c96c68386ecc2d95da25b9dee369;hp=196700745adb4a6782de617ca123d1d1388400fc;hpb=23d455b4469f2b47363c21867aad271d6930f112;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 1967007..1cd41a6 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1022,43 +1022,38 @@ test("jQuery.Deferred()", function() {
 	});
 });
 	
-test("jQuery.isDeferred()", function() {
+test("jQuery.when()", function() {
 	
-	expect( 11 );
+	expect( 14 );
 	
-	var object1 = { then: function() { return this; } },
-		object2 = { then: function() { return this; } };
+	var fakeDeferred = { then: function() { return this; } };
 		
-	object2.then._ = [];
-	
-	// The use case that we want to match
-	ok(jQuery.isDeferred(jQuery._Deferred()), "Simple deferred");
-	ok(jQuery.isDeferred(jQuery.Deferred()), "Failable deferred");
+	fakeDeferred.then._ = [];
 	
 	// Some other objects
-	ok(!jQuery.isDeferred(object1), "Object with then & no marker");
-	ok(!jQuery.isDeferred(object2), "Object with then & marker");
-	
-	// Not objects shouldn't be matched
-	ok(!jQuery.isDeferred(""), "string");
-	ok(!jQuery.isDeferred(0) && !jQuery.isDeferred(1), "number");
-	ok(!jQuery.isDeferred(true) && !jQuery.isDeferred(false), "boolean");
-	ok(!jQuery.isDeferred(null), "null");
-	ok(!jQuery.isDeferred(undefined), "undefined");
-	
-	object1 = {custom: jQuery._Deferred().then};
-	
-	ok(!jQuery.isDeferred(object1) , "custom method name not found automagically");
-	ok(jQuery.isDeferred(object1,"custom") , "custom method name");
-});
-
-test("jQuery.when()", function() {
+	jQuery.each( {
+		
+		"Object with then & no marker": { then: jQuery.noop },
+		"Object with then & marker": fakeDeferred,
+		"string 1/2": "",
+		"string 2/2": "some string",
+		"number 1/2": 0,
+		"number 2/2": 1,
+		"boolean 1/2": true,
+		"boolean 2/2": false,
+		"null": null,
+		"undefined": undefined,
+		"custom method name not found automagically": {custom: jQuery._Deferred().then}
 	
-	expect( 5 );
+	} , function( message , value ) {
+		
+		notStrictEqual( jQuery.when( value ) , value , message );
+		
+	} );
 	
-	var cache, i, deferred = { done: jQuery.Deferred().resolve( 1 ).then };
+	var cache, i;
 	
-	for( i = 1 ; i < 3 ; i++ ) {
+	for( i = 1 ; i < 4 ; i++ ) {
 		jQuery.when( cache || jQuery.Deferred( function() {
 			this.resolve( i );
 		}) ).then( function( value ) {
@@ -1068,22 +1063,4 @@ test("jQuery.when()", function() {
 			ok( false , "Fail called" );
 		});
 	}
-	
-	cache = 0;
-
-	for( i = 1 ; i < 3 ; i++ ) {
-		jQuery.when( cache || deferred , "done" ).done( function( value ) {
-			strictEqual( value , 1 , "Custom method: resolved" + ( i > 1 ? " only once" : "" ) );
-			cache = value;
-		}).fail( function() {
-			ok( false , "Custom method: fail called" );
-		});
-	}
-	
-	stop();
-	
-	jQuery.when( jQuery( document ) , "ready" ).then( function( test ) {
-		strictEqual( test , jQuery , "jQuery.fn.ready recognized as a deferred" );
-		start();
-	});
 });