Permalink
Browse files

Tests: Add dummy modules when running basic tests

Without this, other modules don't appear in the QUnit module picker.

Ref 855b0c8
Closes gh-2582
  • Loading branch information...
gibson042 committed Sep 8, 2015
1 parent 99e8ff1 commit f9af896bb8f4cb37b22d508443174c8edf40fc54
Showing with 16 additions and 13 deletions.
  1. +16 −13 test/data/testinit.js
View
@@ -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();

0 comments on commit f9af896

Please sign in to comment.