From b36d54256968b028a9c324eba6d88754561d5ec4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?= Date: Sat, 16 May 2020 08:30:11 +0200 Subject: [PATCH] Tests: Load jQuery Migrate before UI test files This is necessary to catch all possible warnings that the test files may trigger. Closes gh-1918 --- tests/lib/bootstrap.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js index bae1afada..d0c489dc0 100644 --- a/tests/lib/bootstrap.js +++ b/tests/lib/bootstrap.js @@ -60,21 +60,24 @@ function requireModules( dependencies, callback, modules ) { // Load a set of test file along with the required test infrastructure function requireTests( dependencies, noBackCompat ) { - dependencies = [ + var preDependencies = [ "lib/qunit", noBackCompat ? "jquery-no-back-compat" : "jquery", "jquery-simulate" - ].concat( dependencies ); + ]; + + // Load migrate before test files + if ( parseUrl().migrate ) { + preDependencies.push( "jquery-migrate" ); + } + + dependencies = preDependencies.concat( dependencies ); // Load the TestSwarm injector, if necessary if ( parseUrl().swarmURL ) { dependencies.push( "testswarm" ); } - if ( parseUrl().migrate ) { - dependencies.push( "jquery-migrate" ); - } - requireModules( dependencies, function( QUnit ) { QUnit.start(); } ); -- 2.39.5