Merge "OutputPage: Add addHeadItems() method"

[lhc/web/wiklou.git] / tests / phpunit / includes / api / ApiLoginTest.php

diff --git a/tests/phpunit/includes/api/ApiLoginTest.php b/tests/phpunit/includes/api/ApiLoginTest.php
index 2f8ffcc..917a6ad 100644 (file)
--- a/tests/phpunit/includes/api/ApiLoginTest.php
+++ b/tests/phpunit/includes/api/ApiLoginTest.php
@@ -19,7 +19,7 @@ class ApiLoginTest extends ApiTestCase {
                        'wsTokenSecrets' => [ 'login' => 'foobar' ],
                ];
                $data = $this->doApiRequest( [ 'action' => 'login',
-                       'lgname' => '', 'lgpassword' => self::$users['sysop']->password,
+                       'lgname' => '', 'lgpassword' => self::$users['sysop']->getPassword(),
                        'lgtoken' => (string)( new MediaWiki\Session\Token( 'foobar', '' ) )
                ], $session );
                $this->assertEquals( $wgDisableAuthManager ? 'NoName' : 'Failed', $data[0]['login']['result'] );
@@ -29,6 +29,7 @@ class ApiLoginTest extends ApiTestCase {
                global $wgServer, $wgDisableAuthManager;
 
                $user = self::$users['sysop'];
+               $userName = $user->getUser()->getName();
                $user->getUser()->logout();
 
                if ( !isset( $wgServer ) ) {
@@ -36,7 +37,7 @@ class ApiLoginTest extends ApiTestCase {
                }
                $ret = $this->doApiRequest( [
                        "action" => "login",
-                       "lgname" => $user->username,
+                       "lgname" => $userName,
                        "lgpassword" => "bad",
                ] );
 
@@ -52,7 +53,7 @@ class ApiLoginTest extends ApiTestCase {
                        [
                                "action" => "login",
                                "lgtoken" => $token,
-                               "lgname" => $user->username,
+                               "lgname" => $userName,
                                "lgpassword" => "badnowayinhell",
                        ],
                        $ret[2]
@@ -74,12 +75,14 @@ class ApiLoginTest extends ApiTestCase {
                }
 
                $user = self::$users['sysop'];
+               $userName = $user->getUser()->getName();
+               $password = $user->getPassword();
                $user->getUser()->logout();
 
                $ret = $this->doApiRequest( [
                                "action" => "login",
-                               "lgname" => $user->username,
-                               "lgpassword" => $user->password,
+                               "lgname" => $userName,
+                               "lgpassword" => $password,
                        ]
                );
 
@@ -95,8 +98,8 @@ class ApiLoginTest extends ApiTestCase {
                        [
                                "action" => "login",
                                "lgtoken" => $token,
-                               "lgname" => $user->username,
-                               "lgpassword" => $user->password,
+                               "lgname" => $userName,
+                               "lgpassword" => $password,
                        ],
                        $ret[2]
                );
@@ -122,12 +125,14 @@ class ApiLoginTest extends ApiTestCase {
                        $this->markTestIncomplete( 'This test needs $wgServer to be set in LocalSettings.php' );
                }
                $user = self::$users['sysop'];
+               $userName = $user->getUser()->getName();
+               $password = $user->getPassword();
 
                $req = MWHttpRequest::factory( self::$apiUrl . "?action=login&format=xml",
                        [ "method" => "POST",
                                "postData" => [
-                                       "lgname" => $user->username,
-                                       "lgpassword" => $user->password
+                                       "lgname" => $userName,
+                                       "lgpassword" => $password
                                ]
                        ],
                        __METHOD__
@@ -146,8 +151,8 @@ class ApiLoginTest extends ApiTestCase {
 
                $req->setData( [
                        "lgtoken" => $token,
-                       "lgname" => $user->username,
-                       "lgpassword" => $user->password ] );
+                       "lgname" => $userName,
+                       "lgpassword" => $password ] );
                $req->execute();
 
                $cj = $req->getCookieJar();
@@ -162,11 +167,14 @@ class ApiLoginTest extends ApiTestCase {
        }
 
        public function testRunLogin() {
-               $sysopUser = self::$users['sysop'];
+               $user = self::$users['sysop'];
+               $userName = $user->getUser()->getName();
+               $password = $user->getPassword();
+
                $data = $this->doApiRequest( [
                        'action' => 'login',
-                       'lgname' => $sysopUser->username,
-                       'lgpassword' => $sysopUser->password ] );
+                       'lgname' => $userName,
+                       'lgpassword' => $password ] );
 
                $this->assertArrayHasKey( "login", $data[0] );
                $this->assertArrayHasKey( "result", $data[0]['login'] );
@@ -176,13 +184,12 @@ class ApiLoginTest extends ApiTestCase {
                $data = $this->doApiRequest( [
                        'action' => 'login',
                        "lgtoken" => $token,
-                       "lgname" => $sysopUser->username,
-                       "lgpassword" => $sysopUser->password ], $data[2] );
+                       "lgname" => $userName,
+                       "lgpassword" => $password ], $data[2] );
 
                $this->assertArrayHasKey( "login", $data[0] );
                $this->assertArrayHasKey( "result", $data[0]['login'] );
                $this->assertEquals( "Success", $data[0]['login']['result'] );
-               $this->assertArrayHasKey( 'lgtoken', $data[0]['login'] );
        }
 
        public function testBotPassword() {
@@ -244,7 +251,7 @@ class ApiLoginTest extends ApiTestCase {
                        __METHOD__
                );
 
-               $lgName = $user->username . BotPassword::getSeparator() . 'foo';
+               $lgName = $user->getUser()->getName() . BotPassword::getSeparator() . 'foo';
 
                $ret = $this->doApiRequest( [
                        'action' => 'login',