Simplified the way a Promise is tested for (removed promiseMarker). Removed isCancell...

[jquery.git] / test / unit / core.js

diff --git a/test/unit/core.js b/test/unit/core.js
index 1967007..9367ab1 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1022,43 +1022,34 @@ test("jQuery.Deferred()", function() {
        });
 });
        
-test("jQuery.isDeferred()", function() {
-       
-       expect( 11 );
+test("jQuery.when()", function() {
        
-       var object1 = { then: function() { return this; } },
-               object2 = { 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");
+       expect( 21 );
        
        // 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( {
+               
+               "an empty string": "",
+               "a non-empty string": "some string",
+               "zero": 0,
+               "a number other than zero": 1,
+               "true": true,
+               "false": false,
+               "null": null,
+               "undefined": undefined,
+               "a plain object": {}
        
-       expect( 5 );
+       } , function( message , value ) {
+               
+               ok( jQuery.isFunction( jQuery.when( value ).then( function( resolveValue ) {
+                       strictEqual( resolveValue , value , "Test the promise was resolved with " + message );
+               } ).promise ) , "Test " + message + " triggers the creation of a new Promise" );
+               
+       } );
        
-       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 +1059,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();
-       });
 });