Merge "deferred: make DeferredUpdates::attemptUpdate() use callback owners for $fname...

[lhc/web/wiklou.git] / includes / specials / SpecialJavaScriptTest.php

diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php
index c984af8..50a909f 100644 (file)
--- a/includes/specials/SpecialJavaScriptTest.php
+++ b/includes/specials/SpecialJavaScriptTest.php
@@ -103,7 +103,7 @@ class SpecialJavaScriptTest extends SpecialPage {
                $query['only'] = 'scripts';
                $startupContext = new ResourceLoaderContext( $rl, new FauxRequest( $query ) );
 
-               $modules = $rl->getTestModuleNames( 'qunit' );
+               $modules = $rl->getTestSuiteModuleNames();
 
                // Disable autostart because we load modules asynchronously. By default, QUnit would start
                // at domready when there are no tests loaded and also fire 'QUnit.done' which then instructs
@@ -111,7 +111,7 @@ class SpecialJavaScriptTest extends SpecialPage {
                $qunitConfig = 'QUnit.config.autostart = false;'
                        . 'if (window.__karma__) {'
                        // karma-qunit's use of autostart=false and QUnit.start conflicts with ours.
-                       // Hack around this by replacing 'karma.loaded' with a no-op and perfom its duty of calling
+                       // Hack around this by replacing 'karma.loaded' with a no-op and perform its duty of calling
                        // `__karma__.start()` ourselves. See <https://github.com/karma-runner/karma-qunit/issues/27>.
                        . 'window.__karma__.loaded = function () {};'
                        . '}';
@@ -170,11 +170,11 @@ JAVASCRIPT
                );
 
                // Use 'raw' because QUnit loads before ResourceLoader initialises (omit mw.loader.state call)
-               // Use 'test' to ensure OutputPage doesn't use the "async" attribute because QUnit must
+               // Use 'sync' to ensure OutputPage doesn't use the "async" attribute because QUnit must
                // load before qunit/export.
                $scripts = $out->makeResourceLoaderLink( 'jquery.qunit',
                        ResourceLoaderModule::TYPE_SCRIPTS,
-                       [ 'raw' => true, 'sync' => true ]
+                       [ 'raw' => '1', 'sync' => '1' ]
                );
 
                $head = implode( "\n", [ $styles, $scripts ] );