From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 11 Aug 2011 14:13:03 +0000 (+0000)
Subject: Make SpecialRecentchangesTest pass
X-Git-Tag: 1.31.0-rc.0~28355
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=0a213604fd7ee040a8ba925beff9c5fb48563be0;p=lhc%2Fweb%2Fwiklou.git

Make SpecialRecentchangesTest pass
---

diff --git a/tests/phpunit/includes/specials/SpecialRecentchanges.php b/tests/phpunit/includes/specials/SpecialRecentchanges.php
index a98e7c1a39..a0b6e0d4b5 100644
--- a/tests/phpunit/includes/specials/SpecialRecentchanges.php
+++ b/tests/phpunit/includes/specials/SpecialRecentchanges.php
@@ -18,13 +18,12 @@ class SpecialRecentchangesTest extends MediaWikiTestCase {
 
 	/** helper to test SpecialRecentchanges::buildMainQueryConds() */
 	private function assertConditions( $expected, $requestOptions = null, $message = '' ) {
-		global $wgRequest;
-		$savedGlobal = $wgRequest;
+		$context = new RequestContext;
+		$context->setRequest( new FauxRequest( $requestOptions ) );
 
-		# Initialize a WebRequest object ...
-		$wgRequest = new FauxRequest( $requestOptions );
-		# ... then setup the rc object (which use wgRequest internally)
+		# setup the rc object
 		$this->rc = new SpecialRecentChanges();
+		$this->rc->setContext( $context );
 		$formOptions = $this->rc->setup( null );
 
 		# Filter out rc_timestamp conditions which depends on the test runtime
@@ -40,8 +39,6 @@ class SpecialRecentchangesTest extends MediaWikiTestCase {
 			$queryConditions,
 			$message
 		);
-
-		$wgRequest = $savedGlobal;
 	}
 
 	/** return false if condition begin with 'rc_timestamp ' */
@@ -88,7 +85,7 @@ class SpecialRecentchangesTest extends MediaWikiTestCase {
 			array( # expected
 				#0 => "rc_timestamp >= '20110223000000'",
 				'rc_bot' => 0,
-				1 => sprintf( "(rc_namespace = '%s' OR rc_namespace = '%s')", $ns1, $ns2 ),
+				1 => sprintf( "rc_namespace IN ('%s','%s')", $ns1, $ns2 ),
 			),
 			array(
 				'namespace' => $ns1,
@@ -107,7 +104,7 @@ class SpecialRecentchangesTest extends MediaWikiTestCase {
 			array( # expected
 				#0 => "rc_timestamp >= '20110223000000'",
 				'rc_bot' => 0,
-				1 => sprintf( "(rc_namespace != '%s' AND rc_namespace != '%s')", $ns1, $ns2 ),
+				1 => sprintf( "rc_namespace NOT IN ('%s','%s')", $ns1, $ns2 ),
 			),
 			array(
 				'namespace'  => $ns1,