deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplified the way a Promise is tested for (removed promiseMarker). Removed isCancelled helper method from _Deferred, wasn't used nor tested. Reworked jQuery.Deferred and removed unnecessary variables. Also ensured a Promise will return itself when asked for a Promise. Finally, the jQuery.when tests have been revamped.

Browse source
This commit is contained in:
jaubourg 2010-12-30 17:06:53 +01:00
parent 3c6f1380fa
commit 6fb9759a75
2 changed files with 30 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

26
test/unit/core.js
View file

@ -1024,30 +1024,26 @@ test("jQuery.Deferred()", function() {
test("jQuery.when()", function() {
expect( 14 );
var fakeDeferred = { then: function() { return this; } };
fakeDeferred.then._ = [];
expect( 21 );
// Some other objects
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,
"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,
"custom method name not found automagically": {custom: jQuery._Deferred().then}
"a plain object": {}
} , function( message , value ) {
notStrictEqual( jQuery.when( value ) , value , message );
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" );
} );