From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 4 Feb 2016 23:06:11 +0000 (+0000)
Subject: Merge "mediawiki.jqueryMsg.test: Call async() before each async test step"
X-Git-Tag: 1.31.0-rc.0~8077
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=a70e9966905682b70608b045f612945e43724ab3;hp=74174fca253b9a759d7402f09b7fc37d5de0e9be

Merge "mediawiki.jqueryMsg.test: Call async() before each async test step"
---

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index 43b324edb5..07eddbfba5 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -119,9 +119,8 @@
 	/**
 	 * @param {Function[]} tasks List of functions that perform tasks
 	 *  that may be asynchronous. Invoke the callback parameter when done.
-	 * @param {Function} complete Called when all tasks are done, or when the sequence is aborted.
 	 */
-	function process( tasks, complete ) {
+	function process( tasks ) {
 		/*jshint latedef:false */
 		function abort() {
 			tasks.splice( 0, tasks.length );
@@ -140,7 +139,6 @@
 			} else {
 				// Remove tasks list to indicate the process is final.
 				tasks = null;
-				complete();
 			}
 		}
 		next();
@@ -367,6 +365,7 @@
 		mw.messages.set( mw.libs.phpParserData.messages );
 		var tasks = $.map( mw.libs.phpParserData.tests, function ( test ) {
 			return function ( next, abort ) {
+				var done = assert.async();
 				getMwLanguage( test.lang )
 					.then( function ( langClass ) {
 						mw.config.set( 'wgUserLanguage', test.lang );
@@ -379,12 +378,12 @@
 					}, function () {
 						assert.ok( false, 'Language "' + test.lang + '" failed to load.' );
 					} )
+					.then( done, done )
 					.then( next, abort );
 			};
 		} );
 
-		QUnit.stop();
-		process( tasks, QUnit.start );
+		process( tasks );
 	} );
 
 	QUnit.test( 'Links', 14, function ( assert ) {
@@ -888,6 +887,7 @@
 		mw.messages.set( 'formatnum-msg-int', '{{formatnum:$1|R}}' );
 		var queue = $.map( formatnumTests, function ( test ) {
 			return function ( next, abort ) {
+				var done = assert.async();
 				getMwLanguage( test.lang )
 					.then( function ( langClass ) {
 						mw.config.set( 'wgUserLanguage', test.lang );
@@ -901,11 +901,11 @@
 					}, function () {
 						assert.ok( false, 'Language "' + test.lang + '" failed to load' );
 					} )
+					.then( done, done )
 					.then( next, abort );
 			};
 		} );
-		QUnit.stop();
-		process( queue, QUnit.start );
+		process( queue );
 	} );
 
 	// HTML in wikitext