From 44c84777a9ec718b4ac0b4207ce0b13428021fa0 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Sun, 3 Aug 2014 15:54:01 -0700 Subject: [PATCH] SpecialJavaScriptTest: Use Config instead of globals Change-Id: I7f32c7ff63dc1547e4bd76153ec449894dbd0184 --- includes/specials/SpecialJavaScriptTest.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/includes/specials/SpecialJavaScriptTest.php b/includes/specials/SpecialJavaScriptTest.php index a67d3c0b46..0efebb3eef 100644 --- a/includes/specials/SpecialJavaScriptTest.php +++ b/includes/specials/SpecialJavaScriptTest.php @@ -134,16 +134,15 @@ class SpecialJavaScriptTest extends SpecialPage { * Initialize the page for QUnit. */ private function initQUnitTesting() { - global $wgJavaScriptTestConfig; - $out = $this->getOutput(); + $testConfig = $this->getConfig()->get( 'JavaScriptTestConfig' ); $out->addModules( 'test.mediawiki.qunit.testrunner' ); $qunitTestModules = $out->getResourceLoader()->getTestModuleNames( 'qunit' ); $out->addModules( $qunitTestModules ); $summary = $this->msg( 'javascripttest-qunit-intro' ) - ->params( $wgJavaScriptTestConfig['qunit']['documentation'] ) + ->params( $testConfig['qunit']['documentation'] ) ->parseAsBlock(); $header = $this->msg( 'javascripttest-qunit-heading' )->escaped(); $userDir = $this->getLanguage()->getDir(); @@ -169,7 +168,7 @@ HTML; // $wgJavaScriptTestConfig in DefaultSettings.php $out->addJsConfigVars( 'QUnitTestSwarmInjectJSPath', - $wgJavaScriptTestConfig['qunit']['testswarm-injectjs'] + $testConfig['qunit']['testswarm-injectjs'] ); } -- 2.20.1