X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fuser%2FUserGroupMembershipTest.php;h=6f575789f51c03223233be3cf77fd607b731063a;hp=340a4c310646344d789102782049e9143bc1aecc;hb=7b4eafda0d986180d20f37f2489b70e8eca00df4;hpb=9e4326370946eace9a20cd3d89f57a027f64257a

diff --git a/tests/phpunit/includes/user/UserGroupMembershipTest.php b/tests/phpunit/includes/user/UserGroupMembershipTest.php
index 340a4c3106..6f575789f5 100644
--- a/tests/phpunit/includes/user/UserGroupMembershipTest.php
+++ b/tests/phpunit/includes/user/UserGroupMembershipTest.php
@@ -1,5 +1,7 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * @group Database
  */
@@ -46,8 +48,6 @@ class UserGroupMembershipTest extends MediaWikiTestCase {
 		$this->userTester->addGroup( 'unittesters' );
 		$this->expiryTime = wfTimestamp( TS_MW, time() + 100500 );
 		$this->userTester->addGroup( 'testwriters', $this->expiryTime );
-
-		$this->resetServices();
 	}
 
 	/**
@@ -63,7 +63,9 @@ class UserGroupMembershipTest extends MediaWikiTestCase {
 		$user->clearInstanceCache();
 		$this->assertContains( 'unittesters', $user->getGroups() );
 		$this->assertArrayHasKey( 'unittesters', $user->getGroupMemberships() );
-		$this->assertTrue( $user->isAllowed( 'runtest' ) );
+		$this->assertTrue( MediaWikiServices::getInstance()
+			->getPermissionManager()
+			->userHasRight( $user, 'runtest' ) );
 
 		// try updating without allowUpdate. Should fail
 		$ugm = new UserGroupMembership( $user->getId(), 'unittesters', $this->expiryTime );
@@ -74,7 +76,9 @@ class UserGroupMembershipTest extends MediaWikiTestCase {
 		$user->clearInstanceCache();
 		$this->assertContains( 'unittesters', $user->getGroups() );
 		$this->assertArrayHasKey( 'unittesters', $user->getGroupMemberships() );
-		$this->assertTrue( $user->isAllowed( 'runtest' ) );
+		$this->assertTrue( MediaWikiServices::getInstance()
+			->getPermissionManager()
+			->userHasRight( $user, 'runtest' ) );
 
 		// try removing the group
 		$ugm->delete();
@@ -83,7 +87,9 @@ class UserGroupMembershipTest extends MediaWikiTestCase {
 			$this->logicalNot( $this->contains( 'unittesters' ) ) );
 		$this->assertThat( $user->getGroupMemberships(),
 			$this->logicalNot( $this->arrayHasKey( 'unittesters' ) ) );
-		$this->assertFalse( $user->isAllowed( 'runtest' ) );
+		$this->assertFalse( MediaWikiServices::getInstance()
+			->getPermissionManager()
+			->userHasRight( $user, 'runtest' ) );
 
 		// check that the user group is now in user_former_groups
 		$this->assertContains( 'unittesters', $user->getFormerGroups() );