Merge "mw.Upload.BookletLayout/Dialog: Add determinate progress bar"

[lhc/web/wiklou.git] / tests / qunit / data / testrunner.js

diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index b57b6cf..07e6f26 100644 (file)
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -8,9 +8,9 @@
        /**
         * Add bogus to url to prevent IE crazy caching
         *
-        * @param {String} value a relative path (eg. 'data/foo.js'
+        * @param {string} value a relative path (eg. 'data/foo.js'
         * or 'data/test.php?foo=bar').
-        * @return {String} Such as 'data/foo.js?131031765087663960'
+        * @return {string} Such as 'data/foo.js?131031765087663960'
         */
        QUnit.fixurl = function ( value ) {
                return value + ( /\?/.test( value ) ? '&' : '?' )
@@ -22,10 +22,9 @@
         * Configuration
         */
 
-       // When a test() indicates asynchronicity with stop(),
-       // allow 30 seconds to pass before killing the test(),
-       // and assuming failure.
-       QUnit.config.testTimeout = 30 * 1000;
+       // For each test() that is asynchronous, allow this time to pass before
+       // killing the test and assuming timeout failure.
+       QUnit.config.testTimeout = 60 * 1000;
 
        QUnit.config.requireExpects = true;
 
@@ -164,6 +163,7 @@
        /**
         * Reset mw.config and others to a fresh copy of the live config for each test(),
         * and restore it back to the live one afterwards.
+        *
         * @param {Object} [localEnv]
         * @example (see test suite at the bottom of this file)
         * </code>