Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Tests: Pass a number of necessary done() calls to assert.async()
It is no longer needed to create `done` wrappers in tests that require
multiple async operations to complete.
Closes gh-4633
(cherry picked from commit 364476c )
Loading branch information
Showing
2 changed files
with
10 additions
and
10 deletions .
+4
−4
test/unit/basic.js
+6
−6
test/unit/ready.js
@@ -4,14 +4,14 @@ if ( jQuery.ajax ) {
QUnit . test ( "ajax" , function ( assert ) {
assert . expect ( 4 ) ;
var done = jQuery . map ( new Array ( 3 ) , function ( ) { return assert . async ( ) ; } ) ;
var done = assert . async ( 3 ) ;
jQuery . ajax ( {
type : "GET" ,
url : url ( "mock.php?action=name&name=foo" ) ,
success : function ( msg ) {
assert . strictEqual ( msg , "bar" , "Check for GET" ) ;
done . pop ( ) ( ) ;
done ( ) ;
}
} ) ;
@@ -21,14 +21,14 @@ QUnit.test( "ajax", function( assert ) {
data : "name=peter" ,
success : function ( msg ) {
assert . strictEqual ( msg , "pan" , "Check for POST" ) ;
done . pop ( ) ( ) ;
done ( ) ;
}
} ) ;
jQuery ( "#first" ) . load ( url ( "name.html" ) , function ( ) {
assert . ok ( /^ ERROR/ . test ( jQuery ( "#first" ) . text ( ) ) ,
"Check if content was injected into the DOM" ) ;
done . pop ( ) ( ) ;
done ( ) ;
} ) ;
} ) ;
}
@@ -107,31 +107,31 @@ QUnit.module( "ready" );
QUnit [ jQuery . when ? "test" : "skip" ] ( "jQuery.when(jQuery.ready)" , function ( assert ) {
assert . expect ( 2 ) ;
var done = jQuery . map ( new Array ( 2 ) , function ( ) { return assert . async ( ) ; } ) ;
var done = assert . async ( 2 ) ;
whenified . then ( function ( ) {
assert . ok ( jQuery . isReady , "jQuery.when Deferred resolved" ) ;
done . pop ( ) ( ) ;
done ( ) ;
} ) ;
jQuery . when ( jQuery . ready ) . then ( function ( ) {
assert . ok ( jQuery . isReady , "jQuery.when Deferred resolved" ) ;
done . pop ( ) ( ) ;
done ( ) ;
} ) ;
} ) ;
QUnit . test ( "Promise.resolve(jQuery.ready)" , function ( assert ) {
assert . expect ( 2 ) ;
var done = jQuery . map ( new Array ( 2 ) , function ( ) { return assert . async ( ) ; } ) ;
var done = assert . async ( 2 ) ;
promisified . then ( function ( ) {
assert . ok ( jQuery . isReady , "Native promised resolved" ) ;
done . pop ( ) ( ) ;
done ( ) ;
} ) ;
Promise . resolve ( jQuery . ready ) . then ( function ( ) {
assert . ok ( jQuery . isReady , "Native promised resolved" ) ;
done . pop ( ) ( ) ;
done ( ) ;
} ) ;
} ) ;
Toggle all file notes