X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=eb88c4a894def3c68e66993fc79890a0f2db0a28;hb=f7ed2aca562620f9424b1667170352e798e99ef3;hp=619ad92bd59c4996fc1a6f5e2ec46703e04e3c58;hpb=1e1a9c7eb055511dce74e4b5f807b93d5a76bbd6;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 619ad92..eb88c4a 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -905,7 +905,7 @@ test("jQuery.parseJSON", function(){
 
 test("jQuery._Deferred()", function() {
 	
-	expect( 14 );
+	expect( 10 );
 	
 	var deferred,
 		object,
@@ -938,31 +938,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");
@@ -1001,28 +989,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 ) {
@@ -1032,7 +998,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" );
@@ -1052,44 +1018,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; } };
@@ -1114,14 +1047,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() {
@@ -1133,22 +1065,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();
-	});
 });