Fix RequestContextTest screwing up $wgUser

Change-Id: Ib3fabc1b016f33bf188682f7f894e8f52417ee40

diff --git a/tests/phpunit/includes/RequestContextTest.php b/tests/phpunit/includes/RequestContextTest.php
index f595d2d..cae0e52 100644 (file)
--- a/tests/phpunit/includes/RequestContextTest.php
+++ b/tests/phpunit/includes/RequestContextTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @group Database
 
 /**
  * @group Database

+ * @group RequestContext

  */
 class RequestContextTest extends MediaWikiTestCase {
 
  */
 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'
                        )
                );
                                '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();
                $sc = RequestContext::importScopedSession( $sinfo ); // load new context
 
                $info = $context->exportSession();