From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/specials/SpecialJavaScriptTest.php | 33 ++++++++++------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'includes/specials/SpecialJavaScriptTest.php') diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php index 7d745a50..ecb166a4 100644 --- a/includes/specials/SpecialJavaScriptTest.php +++ b/includes/specials/SpecialJavaScriptTest.php @@ -150,12 +150,11 @@ class SpecialJavaScriptTest extends SpecialPage { */ private function viewQUnit() { $out = $this->getOutput(); - $testConfig = $this->getConfig()->get( 'JavaScriptTestConfig' ); $modules = $out->getResourceLoader()->getTestModuleNames( 'qunit' ); $summary = $this->msg( 'javascripttest-qunit-intro' ) - ->params( $testConfig['qunit']['documentation'] ) + ->params( 'https://www.mediawiki.org/wiki/Manual:JavaScript_unit_testing' ) ->parseAsBlock(); $baseHtml = << HTML; - // Used in ./tests/qunit/data/testrunner.js, see also documentation of - // $wgJavaScriptTestConfig in DefaultSettings.php - $out->addJsConfigVars( - 'QUnitTestSwarmInjectJSPath', - $testConfig['qunit']['testswarm-injectjs'] - ); - $out->addHtml( $this->wrapSummaryHtml( $summary ) . $baseHtml ); // The testrunner configures QUnit and essentially depends on it. However, test suites @@ -200,7 +192,6 @@ HTML; */ private function exportQUnit() { $out = $this->getOutput(); - $out->disable(); $rl = $out->getResourceLoader(); @@ -251,9 +242,13 @@ HTML; 'debug' => ResourceLoader::inDebugMode() ? 'true' : 'false', ) ); - $styles = $out->makeResourceLoaderLink( 'jquery.qunit', ResourceLoaderModule::TYPE_STYLES, false ); + $styles = $out->makeResourceLoaderLink( + 'jquery.qunit', ResourceLoaderModule::TYPE_STYLES, false + ); // Use 'raw' since this is a plain HTML page without ResourceLoader - $scripts = $out->makeResourceLoaderLink( 'jquery.qunit', ResourceLoaderModule::TYPE_SCRIPTS, false, array( 'raw' => 'true' ) ); + $scripts = $out->makeResourceLoaderLink( + 'jquery.qunit', ResourceLoaderModule::TYPE_SCRIPTS, false, array( 'raw' => 'true' ) + ); $head = trim( $styles['html'] . $scripts['html'] ); $html = <<