Skip to content

Commit

Permalink
Tests: Don't load non-basic tests when basic module is selected
Browse files Browse the repository at this point in the history
When loading basic tests don't load any others to not overload Android 2.3.
The drawback is that most tests are not selectable in the module dropdown
when the basic module is seelcted.

Refs 2c7e9c9
  • Loading branch information
mgol committed Sep 8, 2015
1 parent 2c7e9c9 commit 855b0c8
Showing 1 changed file with 37 additions and 29 deletions.
66 changes: 37 additions & 29 deletions test/data/testinit.js
Original file line number Diff line number Diff line change
Expand Up @@ -270,41 +270,49 @@ this.iframeCallback = undefined;
QUnit.config.autostart = false;
this.loadTests = function() {
var loadSwarm,
url = window.location.search;
url = window.location.search,
basicTests = url.substring( 1 ).split( "&" ).indexOf( "module=basic" ) > -1;

url = decodeURIComponent( url.slice( url.indexOf( "swarmURL=" ) + "swarmURL=".length ) );
loadSwarm = url && url.indexOf( "http" ) === 0;

// Get testSubproject from testrunner first
require( [ "data/testrunner.js" ], function() {
var 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.
"unit/basic.js",

"unit/core.js",
"unit/callbacks.js",
"unit/deferred.js",
"unit/support.js",
"unit/data.js",
"unit/queue.js",
"unit/attributes.js",
"unit/event.js",
"unit/selector.js",
"unit/traversing.js",
"unit/manipulation.js",
"unit/wrap.js",
"unit/css.js",
"unit/serialize.js",
"unit/ajax.js",
"unit/effects.js",
"unit/offset.js",
"unit/dimensions.js",
"unit/animation.js",
"unit/tween.js"
];
var tests = []
.concat( [

// 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/core.js",
"unit/callbacks.js",
"unit/deferred.js",
"unit/support.js",
"unit/data.js",
"unit/queue.js",
"unit/attributes.js",
"unit/event.js",
"unit/selector.js",
"unit/traversing.js",
"unit/manipulation.js",
"unit/wrap.js",
"unit/css.js",
"unit/serialize.js",
"unit/ajax.js",
"unit/effects.js",
"unit/offset.js",
"unit/dimensions.js",
"unit/animation.js",
"unit/tween.js"
] );

// Ensure load order (to preserve test numbers)
( function loadDep() {
Expand Down

0 comments on commit 855b0c8

Please sign in to comment.