"then" renamed "complete" and new "then" method defined using "complete" and "fail...

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

diff --git a/test/unit/core.js b/test/unit/core.js
index e0938b6..1fc2a4a 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -917,7 +917,7 @@ test("jQuery._Deferred()", function() {
                
        test = false;
                
-       deferred.then( function( value ) {
+       deferred.complete( function( value ) {
                equals( value , "value" , "Test pre-resolve callback" );
                test = true;
        } );
@@ -928,7 +928,7 @@ test("jQuery._Deferred()", function() {
 
        test = false;
        
-       deferred.then( function( value ) {
+       deferred.complete( function( value ) {
                equals( value , "value" , "Test post-resolve callback" );
                test = true;
        } );
@@ -939,7 +939,7 @@ test("jQuery._Deferred()", function() {
        
        test = true;
        
-       deferred.then( function() {
+       deferred.complete( function() {
                ok( false , "Cancel was ignored" );
                test = false;
        } );
@@ -949,18 +949,18 @@ test("jQuery._Deferred()", function() {
        deferred = jQuery._Deferred().resolve();
        
        try {
-               deferred.then( function() {
+               deferred.complete( function() {
                        throw "Error";
                } , function() {
                        ok( true , "Test deferred do not cancel on exception" );
                } );
        } catch( e ) {
                strictEqual( e , "Error" , "Test deferred propagates exceptions");
-               deferred.then();
+               deferred.complete();
        }
        
        test = "";
-       deferred = jQuery._Deferred().then( function() {
+       deferred = jQuery._Deferred().complete( function() {
                
                test += "A";
                
@@ -970,13 +970,13 @@ test("jQuery._Deferred()", function() {
                
        } ).resolve();
        
-       strictEqual( test , "AB" , "Test multiple then parameters" );
+       strictEqual( test , "AB" , "Test multiple complete parameters" );
        
        test = "";
        
-       deferred.then( function() {
+       deferred.complete( function() {
                
-               deferred.then( function() {
+               deferred.complete( function() {
                        
                        test += "C";
                        
@@ -989,11 +989,11 @@ test("jQuery._Deferred()", function() {
                test += "B";
        } );
        
-       strictEqual( test , "ABC" , "Test then callbacks order" );
+       strictEqual( test , "ABC" , "Test complete callbacks order" );
        
        deferred = jQuery._Deferred();
        
-       deferred.fire( jQuery , [ document ] ).then( function( doc ) {
+       deferred.fire( jQuery , [ document ] ).complete( function( doc ) {
                ok( this === jQuery && arguments.length === 1 && doc === document , "Test fire context & args" );
        });
 });
@@ -1011,59 +1011,51 @@ test("jQuery.Deferred()", function() {
        
        jQuery.Deferred().resolve().then( function() {
                ok( true , "Success on resolve" );
-       }).fail( function() {
+       }, function() {
                ok( false , "Error on resolve" );
        });
        
        jQuery.Deferred().reject().then( function() {
                ok( false , "Success on reject" );
-       }).fail( function() {
+       }, function() {
                ok( true , "Error on reject" );
        });
 });
        
-test("jQuery.isDeferred()", function() {
-       
-       expect( 10 );
-       
-       var object1 = { then: function() { return this; } },
-               object2 = { then: function() { return this; } };
-               
-       object2.then._ = [];
+test("jQuery.when()", function() {
        
-       // 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");
-});
-
-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( 2 );
+       } , 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;
        
-       for( i = 1 ; i < 3 ; i++ ) {
+       for( i = 1 ; i < 4 ; i++ ) {
                jQuery.when( cache || jQuery.Deferred( function() {
                        this.resolve( i );
                }) ).then( function( value ) {
                        strictEqual( value , 1 , "Function executed" + ( i > 1 ? " only once" : "" ) );
                        cache = value;
-               }).fail( function() {
+               }, function() {
                        ok( false , "Fail called" );
                });
        }