From: Michał Gołębiowski-Owczarek Date: Mon, 2 Mar 2020 21:15:06 +0000 (+0100) Subject: Tests: Pass a number of necessary done() calls to assert.async() X-Git-Tag: 3.5.0~13 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5ea844f65a820ebba7ae7c82af7bfab58f873e5a;p=jquery.git 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 364476c3dc1231603ba61fc08068fa89fb095e1a) --- diff --git a/test/unit/basic.js b/test/unit/basic.js index c42ee5450..9cb7d25be 100644 --- a/test/unit/basic.js +++ b/test/unit/basic.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(); } ); } ); } diff --git a/test/unit/ready.js b/test/unit/ready.js index fd33c0a18..d1a728b47 100644 --- a/test/unit/ready.js +++ b/test/unit/ready.js @@ -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(); } ); } );