From: Max Semenik <maxsem.wiki@gmail.com>
Date: Fri, 27 Jun 2014 21:18:07 +0000 (-0700)
Subject: Fix RequestContextTest screwing up $wgUser
X-Git-Tag: 1.31.0-rc.0~15193^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=214d590f77e0168f5a26cbef8eeea8a0a247db89;p=lhc%2Fweb%2Fwiklou.git

Fix RequestContextTest screwing up $wgUser

Change-Id: Ib3fabc1b016f33bf188682f7f894e8f52417ee40
---

diff --git a/tests/phpunit/includes/RequestContextTest.php b/tests/phpunit/includes/RequestContextTest.php
index f595d2dc64..cae0e52ef5 100644
--- a/tests/phpunit/includes/RequestContextTest.php
+++ b/tests/phpunit/includes/RequestContextTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @group Database
+ * @group RequestContext
  */
 class RequestContextTest extends MediaWikiTestCase {
 
@@ -53,6 +54,11 @@ class RequestContextTest extends MediaWikiTestCase {
 				'USER-AGENT' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0'
 			)
 		);
+		// importScopedSession() sets these variables
+		$this->setMwGlobals( array(
+			'wgUser' => new User,
+			'wgRequest' => new FauxRequest,
+		) );
 		$sc = RequestContext::importScopedSession( $sinfo ); // load new context
 
 		$info = $context->exportSession();