From 02b2c6c8db024ce9f757d42502720aa2077102db Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem@users.mediawiki.org>
Date: Tue, 6 Sep 2011 16:47:05 +0000
Subject: [PATCH] Fix for r96344: explicitly set $wgExtensionAssetsPath during
 tests

---
 tests/parser/parserTest.inc                     | 3 ++-
 tests/phpunit/includes/parser/NewParserTest.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index b52afb44d9..6d2b2254f6 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -136,13 +136,14 @@ class ParserTest {
 			$wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
 			$wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
 			$parserMemc, $wgThumbnailScriptPath, $wgScriptPath,
-			$wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;
+			$wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath, $wgExtensionAssetsPath;
 
 		$wgScript = '/index.php';
 		$wgScriptPath = '/';
 		$wgArticlePath = '/wiki/$1';
 		$wgStyleSheetPath = '/skins';
 		$wgStylePath = '/skins';
+		$wgExtensionAssetsPath = '/extensions';
 		$wgThumbnailScriptPath = false;
 		$wgLocalFileRepo = array(
 			'class' => 'LocalRepo',
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index edef61bf6d..15247e3547 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -231,6 +231,7 @@ class NewParserTest extends MediaWikiTestCase {
 			'wgScript' => '/index.php',
 			'wgScriptPath' => '/',
 			'wgArticlePath' => '/wiki/$1',
+			'wgExtensionAssetsPath' => '/extensions',
 			'wgActionPaths' => array(),
 			'wgLocalFileRepo' => array(
 				'class' => 'LocalRepo',
-- 
2.20.1