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=4862747b4f6281ef65454bf9c34c0397d0492209;hb=a1ef77b2d80830fbcb617a83961d78cff9d6e384;hpb=4051970d03686d0f05516659a35733cd5325eb37 diff --git a/tests/phpunit/includes/user/UserGroupMembershipTest.php b/tests/phpunit/includes/user/UserGroupMembershipTest.php index 4862747b4f..6f575789f5 100644 --- a/tests/phpunit/includes/user/UserGroupMembershipTest.php +++ b/tests/phpunit/includes/user/UserGroupMembershipTest.php @@ -1,5 +1,7 @@ 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 ); @@ -72,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(); @@ -81,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() );