X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FRequestContextTest.php;h=cae0e52ef524644b5c0e0402d338179dea2bd9f5;hb=6ab14151766918b9c7abf33580cdd64b9f9e79e4;hp=1776b5d5ef29c385c93b87d114ee9d7b3b97db3f;hpb=66f3cc0c2d048b6b0697187ae4a8b99ffdab98f7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/RequestContextTest.php b/tests/phpunit/includes/RequestContextTest.php
index 1776b5d5ef..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 {
 
@@ -25,8 +26,11 @@ class RequestContextTest extends MediaWikiTestCase {
 
 		$curTitle = Title::newFromText( "C" );
 		$context->setTitle( $curTitle );
-		$this->assertTrue( $curTitle->equals( $context->getWikiPage()->getTitle() ),
-			"When a title is updated the WikiPage should be purged and recreated on-demand with the new title." );
+		$this->assertTrue(
+			$curTitle->equals( $context->getWikiPage()->getTitle() ),
+			"When a title is updated the WikiPage should be purged "
+				. "and recreated on-demand with the new title."
+		);
 	}
 
 	/**
@@ -46,8 +50,15 @@ class RequestContextTest extends MediaWikiTestCase {
 			'sessionId' => 'd612ee607c87e749ef14da4983a702cd',
 			'userId' => $user->getId(),
 			'ip' => '192.0.2.0',
-			'headers' => array( 'USER-AGENT' => 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:18.0) Gecko/20100101 Firefox/18.0' )
+			'headers' => array(
+				'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();
@@ -55,12 +66,24 @@ class RequestContextTest extends MediaWikiTestCase {
 		$this->assertEquals( $sinfo['headers'], $info['headers'], "Correct headers." );
 		$this->assertEquals( $sinfo['sessionId'], $info['sessionId'], "Correct session ID." );
 		$this->assertEquals( $sinfo['userId'], $info['userId'], "Correct user ID." );
-		$this->assertEquals( $sinfo['ip'], $context->getRequest()->getIP(), "Correct context IP address." );
-		$this->assertEquals( $sinfo['headers'], $context->getRequest()->getAllHeaders(), "Correct context headers." );
+		$this->assertEquals(
+			$sinfo['ip'],
+			$context->getRequest()->getIP(),
+			"Correct context IP address."
+		);
+		$this->assertEquals(
+			$sinfo['headers'],
+			$context->getRequest()->getAllHeaders(),
+			"Correct context headers."
+		);
 		$this->assertEquals( $sinfo['sessionId'], session_id(), "Correct context session ID." );
 		$this->assertEquals( true, $context->getUser()->isLoggedIn(), "Correct context user." );
 		$this->assertEquals( $sinfo['userId'], $context->getUser()->getId(), "Correct context user ID." );
-		$this->assertEquals( 'UnitTestContextUser', $context->getUser()->getName(), "Correct context user name." );
+		$this->assertEquals(
+			'UnitTestContextUser',
+			$context->getUser()->getName(),
+			"Correct context user name."
+		);
 
 		unset( $sc ); // restore previous context