From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 3 Oct 2010 15:58:00 +0000 (+0000)
Subject: Variable UserWrapper used in both testApiLoginBadPass and testApiLoginGoodPass
X-Git-Tag: 1.31.0-rc.0~34645
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=3a2d71e3ea64404e348209ab024f9410145a7364;p=lhc%2Fweb%2Fwiklou.git

Variable UserWrapper used in both testApiLoginBadPass and testApiLoginGoodPass

Switch testApiLoginGoodPass to use sysOp user, as I imagine, logins would be a false positive, per Brion r74122#c9828
---

diff --git a/maintenance/tests/phpunit/includes/api/ApiTest.php b/maintenance/tests/phpunit/includes/api/ApiTest.php
index 7de790635e..f031157343 100644
--- a/maintenance/tests/phpunit/includes/api/ApiTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiTest.php
@@ -87,12 +87,14 @@ class ApiTest extends ApiTestSetup {
 	function testApiLoginBadPass() {
 		global $wgServer;
 
+		$user = self::$sysopUser;
+
 		if ( !isset( $wgServer ) ) {
 			$this->markTestIncomplete( 'This test needs $wgServer to be set in LocalSettings.php' );
 		}
 		$ret = $this->doApiRequest( array(
 			"action" => "login",
-			"lgname" => self::$sysopUser->userName,
+			"lgname" => $user->userName,
 			"lgpassword" => "bad",
 			)
 		);
@@ -108,7 +110,7 @@ class ApiTest extends ApiTestSetup {
 		$ret = $this->doApiRequest( array(
 			"action" => "login",
 			"lgtoken" => $token,
-			"lgname" => self::$sysopUser->userName,
+			"lgname" => $user->userName,
 			"lgpassword" => "bad",
 			)
 		);
@@ -128,10 +130,12 @@ class ApiTest extends ApiTestSetup {
 			$this->markTestIncomplete( 'This test needs $wgServer to be set in LocalSettings.php' );
 		}
 
+		$user = self::$sysopUser;
+
 		$ret = $this->doApiRequest( array(
 			"action" => "login",
-			"lgname" => self::$user->userName,
-			"lgpassword" => self::$user->password,
+			"lgname" => $user->userName,
+			"lgpassword" => $user->password,
 			)
 		);
 
@@ -146,8 +150,8 @@ class ApiTest extends ApiTestSetup {
 		$ret = $this->doApiRequest( array(
 			"action" => "login",
 			"lgtoken" => $token,
-			"lgname" => self::$user->userName,
-			"lgpassword" => self::$user->password,
+			"lgname" => $user->userName,
+			"lgpassword" => $user->password,
 			)
 		);