[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: Replace TestUser::$user with TestUser::getUser()

[Robert Vogel (Code Review)]

Robert Vogel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/346495 )

Change subject: Replace TestUser::$user with TestUser::getUser()
......................................................................

Replace TestUser::$user with TestUser::getUser()

TestUser::$user was made private and was also deprecated and instead 
recommended to use TestUser::getUser()

This TestUser::getUser() was introduced in 1.25 so we don't need any
compat here for 1.27.

I had a lot of help from Reedy to do this.

Change-Id: Iffa7b6c839264b82dc9b2fafa7043c663dc2b29d
---
M UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
1 file changed, 19 insertions(+), 13 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/95/346495/1

diff --git a/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php 
b/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
index bb426c3..ab0e3e9 100644
--- a/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
+++ b/UserManager/tests/phpunit/BSApiTasksUserManagerTest.php
@@ -35,8 +35,9 @@
        }
 
        public function testEditUser () {
+               $userId = self::$users[ 'uploader' ]->getUser()->getId();
                $data = $this->executeTask ( 'editUser', array (
-                       'userID' => self::$users[ 'uploader' ]->user->getId(),
+                       'userID' => $userId,
                        'realname' => 'Some Other Name',
                        'password' => 'pass123',
                        'rePassword' => 'pass123',
@@ -50,44 +51,48 @@
                $this->assertSelect(
                        'user',
                        array( 'user_real_name'),
-                       array( "user_id = '" . self::$users[ 'uploader' 
]->user->getId() . "'" ),
-                       array(  array( 'Some Other Name' )  )
+                       array( "user_id = '" . $userId . "'" ),
+                       array( array( 'Some Other Name' ) )
                );
        }
 
        public function testDisableUser () {
+               $userId = self::$users[ 'uploader' ]->getUser()->getId();
                $data = $this->executeTask ( 'disableUser', array (
-                       'userID' => self::$users[ 'uploader' ]->user->getId ()
+                       'userID' => $userId
                ) );
 
                $this->assertEquals ( true, $data->success );
 
-               $this->assertTrue( $this->userIsBlocked( self::$users[ 
'uploader' ]->user->getId() ) );
+               $this->assertTrue( $this->userIsBlocked( $userId ) );
        }
 
        public function testEnableUser () {
+               $userId = self::$users[ 'uploader' ]->getUser()->getId();
                $data = $this->executeTask ( 'enableUser', array (
-                       'userID' => self::$users[ 'uploader' ]->user->getId ()
+                       'userID' => $userId
                ) );
 
                $this->assertEquals ( true, $data->success );
 
-               $this->assertFalse( $this->userIsBlocked( self::$users[ 
'uploader' ]->user->getId() ) );
+               $this->assertFalse( $this->userIsBlocked( $userId ) );
        }
 
        public function testDeleteUser () {
+               $userId = self::$users[ 'uploader' ]->getUser()->getId();
                $data = $this->executeTask ( 'deleteUser', array (
-                       'userIDs' => [ self::$users[ 'uploader' ]->user->getId 
() ]
+                       'userIDs' => [ $userId ]
                ) );
 
                $this->assertEquals ( true, $data->success );
 
-               $this->assertFalse( $this->existsInDb( self::$users[ 'uploader' 
]->user->getId() ) );
+               $this->assertFalse( $this->existsInDb( $userId ) );
        }
 
        public function setUserGroups () {
+               $userId = self::$users[ 'uploader' ]->getUser()->getId();
                $data = $this->executeTask ( 'addUser', array (
-                       'userIDs' => [ self::$users[ 'uploader' ]->user->getId 
() ],
+                       'userIDs' => [ $userId ],
                        'groups' => array ( 'bot' )
                ) );
 
@@ -96,14 +101,15 @@
                $this->assertSelect(
                        'user_groups',
                        array( 'ug_group'),
-                       array( "ug_user = '" . self::$users[ 'uploader' 
]->user->getId() . "'" ),
-                       array(  array( 'bot' )  )
+                       array( "ug_user = '" . $userId . "'" ),
+                       array( array( 'bot' ) )
                );
        }
 
        public function editPassword () {
+               $userId = self::$users[ 'uploader' ]->getUser()->getId();
                $data = $this->executeTask ( 'addUser', array (
-                       'userID' => self::$users[ 'uploader' ]->user->getId (),
+                       'userID' => $userId,
                        'password' => 'pass1234',
                        'rePassword' => 'pass1234'
                ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/346495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffa7b6c839264b82dc9b2fafa7043c663dc2b29d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits