| Index: branches/JSTesting/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -208,16 +208,14 @@ |
| 209 | 209 | // Get core test suites |
| 210 | 210 | $testModules = array(); |
| 211 | 211 | $testModules['qunit'] = include( "$IP/tests/qunit/QUnitTestResources.php" ); |
| | 212 | + // Add the testrunner to the dependencies to make sure it's loaded first |
| | 213 | + $testModules['qunit']['mediawiki.tests.qunit.suites']['dependencies'][] |
| | 214 | + = 'mediawiki.tests.qunit.testrunner'; |
| | 215 | + |
| 212 | 216 | // Allow extensions to add test suites |
| 213 | 217 | wfRunHooks( 'ResourceLoaderTestModules', array( &$testModules, &$this ) ); |
| 214 | 218 | |
| 215 | 219 | foreach( $testModules as $id => $names ) { |
| 216 | | - |
| 217 | | - // Add the testrunner to the dependencies to make sure it's loaded first |
| 218 | | - foreach( $names as $name ) { |
| 219 | | - $testModules[$id][$name]['dependencies'][] = 'mediawiki.tests.qunit.testrunner'; |
| 220 | | - } |
| 221 | | - |
| 222 | 220 | // Register test modules |
| 223 | 221 | $this->register( $testModules[$id] ); |
| 224 | 222 | |