Renamed several ajaxSettings options. Removed cors test, fixed failing cors test.

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

diff --git a/test/unit/core.js b/test/unit/core.js
index 1b6b163..e0938b6 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -907,7 +907,7 @@ test("jQuery.parseJSON", function(){
 
 test("jQuery._Deferred()", function() {
        
-       expect( 14 );
+       expect( 10 );
        
        var deferred,
                object,
@@ -940,31 +940,19 @@ test("jQuery._Deferred()", function() {
        test = true;
        
        deferred.then( function() {
-               ok( false , "Manual cancel was ignored" );
+               ok( false , "Cancel was ignored" );
                test = false;
        } );
        
-       ok( test , "Test manual cancel" );
+       ok( test , "Test cancel" );
        
-       deferred = jQuery._Deferred().then( function() {
-               return false;
-       } );
-       
-       deferred.resolve();
-       
-       test = true;
-       
-       deferred.then( function() {
-               test = false;
-       } );
+       deferred = jQuery._Deferred().resolve();
        
-       ok( test , "Test cancel by returning false" );
-
        try {
-               deferred = jQuery._Deferred().resolve().then( function() {
+               deferred.then( function() {
                        throw "Error";
                } , function() {
-                       ok( false , "Test deferred cancel on exception" );
+                       ok( true , "Test deferred do not cancel on exception" );
                } );
        } catch( e ) {
                strictEqual( e , "Error" , "Test deferred propagates exceptions");
@@ -1003,28 +991,6 @@ test("jQuery._Deferred()", function() {
        
        strictEqual( test , "ABC" , "Test then callbacks order" );
        
-       deferred = jQuery._Deferred( false ).resolve().cancel();
-       
-       deferred.then( function() {
-               ok( true , "Test non-cancellable deferred not cancelled manually");
-               return false;
-       } );
-
-       deferred.then( function() {
-               ok( true , "Test non-cancellable deferred not cancelled by returning false");
-       } );
-       
-       try {
-               deferred.then( function() {
-                       throw "Error";
-               } , function() {
-                       ok( true , "Test non-cancellable deferred keeps callbacks after exception" );
-               } );
-       } catch( e ) {
-               strictEqual( e , "Error" , "Test non-cancellable deferred propagates exceptions");
-               deferred.then();
-       }
-       
        deferred = jQuery._Deferred();
        
        deferred.fire( jQuery , [ document ] ).then( function( doc ) {
@@ -1034,7 +1000,7 @@ test("jQuery._Deferred()", function() {
 
 test("jQuery.Deferred()", function() {
        
-       expect( 8 );
+       expect( 4 );
        
        jQuery.Deferred( function( defer ) {
                strictEqual( this , defer , "Defer passed as this & first argument" );
@@ -1054,44 +1020,11 @@ test("jQuery.Deferred()", function() {
        }).fail( function() {
                ok( true , "Error on reject" );
        });
-       
-       var flag = true;
-       
-       jQuery.Deferred().resolve().cancel().then( function() {
-               ok( flag = false , "Success on resolve/cancel" );
-       }).fail( function() {
-               ok( flag = false , "Error on resolve/cancel" );
-       });
-       
-       ok( flag , "Cancel on resolve" );
-       
-       flag = true;
-       
-       jQuery.Deferred().reject().cancel().then( function() {
-               ok( flag = false , "Success on reject/cancel" );
-       }).fail( function() {
-               ok( flag = false , "Error on reject/cancel" );
-       });
-       
-       ok( flag , "Cancel on reject" );
-       
-       jQuery.Deferred( false ).resolve().then( function() {
-               return false;
-       } , function() {
-               ok( true , "Not cancelled on resolve" );
-       });
-       
-       jQuery.Deferred( false ).reject().fail( function() {
-               return false;
-       } , function() {
-               ok( true , "Not cancelled on reject" );
-       });
-       
 });
        
 test("jQuery.isDeferred()", function() {
        
-       expect( 11 );
+       expect( 10 );
        
        var object1 = { then: function() { return this; } },
                object2 = { then: function() { return this; } };
@@ -1116,14 +1049,13 @@ test("jQuery.isDeferred()", function() {
        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() {
        
-       expect( 5 );
+       expect( 2 );
        
-       var cache, i, deferred = { done: jQuery.Deferred().resolve( 1 ).then };
+       var cache, i;
        
        for( i = 1 ; i < 3 ; i++ ) {
                jQuery.when( cache || jQuery.Deferred( function() {
@@ -1135,22 +1067,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();
-       });
 });