diff --git a/test/data/testinit.js b/test/data/testinit.js index fb99badfc..68de5e336 100644 --- a/test/data/testinit.js +++ b/test/data/testinit.js @@ -278,20 +278,14 @@ this.loadTests = function() { // Get testSubproject from testrunner first require( [ "data/testrunner.js" ], function() { - var tests = [] - .concat( [ - + var i = 0, + tests = [ // A special module with basic tests, meant for // not fully supported environments like Android 2.3, // jsdom or PhantomJS. We run it everywhere, though, // to make sure tests are not broken. - // - // Support: Android 2.3 only - // When loading basic tests don't load any others to not - // overload Android 2.3. - "unit/basic.js" - ] ) - .concat( basicTests ? [] : [ + "unit/basic.js", + "unit/core.js", "unit/callbacks.js", "unit/deferred.js", @@ -312,14 +306,23 @@ this.loadTests = function() { "unit/dimensions.js", "unit/animation.js", "unit/tween.js" - ] ); + ]; // Ensure load order (to preserve test numbers) ( function loadDep() { - var dep = tests.shift(); + var dep = tests[ i++ ]; if ( dep ) { - require( [ dep ], loadDep ); + if ( !basicTests || i === 1 ) { + require( [ dep ], loadDep ); + + // Support: Android 2.3 only + // When running basic tests, replace other modules with dummies to avoid overloading + // impaired clients. + } else { + QUnit.module( dep.replace( /^.*\/|\.js$/g, "" ) ); + loadDep(); + } } else { QUnit.load();