1 files changed, 9 insertions, 14 deletions
diff --git a/tests/phpunit/includes/Rest/BasicAccess/MWBasicRequestAuthorizerTest.php b/tests/phpunit/includes/Rest/BasicAccess/MWBasicRequestAuthorizerTest.php
index d1d20f023956..2984bf1ae70f 100644
--- a/tests/phpunit/includes/Rest/BasicAccess/MWBasicRequestAuthorizerTest.php
+++ b/tests/phpunit/includes/Rest/BasicAccess/MWBasicRequestAuthorizerTest.php
@@ -3,7 +3,7 @@
 namespace MediaWiki\Tests\Rest\BasicAccess;
 
 use GuzzleHttp\Psr7\Uri;
-use MediaWiki\Permissions\PermissionManager;
+use MediaWiki\Permissions\SimpleAuthority;
 use MediaWiki\Rest\BasicAccess\MWBasicAuthorizer;
 use MediaWiki\Rest\Handler;
 use MediaWiki\Rest\RequestData;
@@ -29,13 +29,7 @@ class MWBasicRequestAuthorizerTest extends MediaWikiIntegrationTestCase {
 		$objectFactory = new ObjectFactory(
 			$this->getMockForAbstractClass( ContainerInterface::class )
 		);
-		$permissionManager = $this->createMock( PermissionManager::class );
-		// Don't allow the rights to everybody so that user rights kick in.
-		$permissionManager->method( 'isEveryoneAllowed' )->willReturn( false );
-		$permissionManager->method( 'userHasRight' )
-			->will( $this->returnCallback( function ( $user, $action ) use ( $userRights ) {
-				return isset( $userRights[$action] ) && $userRights[$action];
-			} ) );
+		$authority = new SimpleAuthority( $user, $userRights );
 
 		global $IP;
 
@@ -46,16 +40,17 @@ class MWBasicRequestAuthorizerTest extends MediaWikiIntegrationTestCase {
 			'/rest',
 			new \EmptyBagOStuff(),
 			new ResponseFactory( [] ),
-			new MWBasicAuthorizer( $user, $permissionManager ),
+			new MWBasicAuthorizer( $authority ),
+			$authority,
 			$objectFactory,
-			new Validator( $objectFactory, $permissionManager, $request, $user ),
+			new Validator( $objectFactory, $request, $authority ),
 			$this->createHookContainer()
 		);
 	}
 
 	public function testReadDenied() {
 		$request = new RequestData( [ 'uri' => new Uri( '/rest/mock/RouterTest/hello' ) ] );
-		$router = $this->createRouter( [ 'read' => false ], $request );
+		$router = $this->createRouter( [], $request );
 		$response = $router->execute( $request );
 		$this->assertSame( 403, $response->getStatusCode() );
 
@@ -67,7 +62,7 @@ class MWBasicRequestAuthorizerTest extends MediaWikiIntegrationTestCase {
 
 	public function testReadAllowed() {
 		$request = new RequestData( [ 'uri' => new Uri( '/rest/mock/RouterTest/hello' ) ] );
-		$router = $this->createRouter( [ 'read' => true ], $request );
+		$router = $this->createRouter( [ 'read' ], $request );
 		$response = $router->execute( $request );
 		$this->assertSame( 200, $response->getStatusCode() );
 	}
@@ -88,7 +83,7 @@ class MWBasicRequestAuthorizerTest extends MediaWikiIntegrationTestCase {
 		$request = new RequestData( [
 			'uri' => new Uri( '/rest/mock/MWBasicRequestAuthorizerTest/write' )
 		] );
-		$router = $this->createRouter( [ 'read' => true, 'writeapi' => false ], $request );
+		$router = $this->createRouter( [ 'read' ], $request );
 		$response = $router->execute( $request );
 		$this->assertSame( 403, $response->getStatusCode() );
 
@@ -102,7 +97,7 @@ class MWBasicRequestAuthorizerTest extends MediaWikiIntegrationTestCase {
 		$request = new RequestData( [
 			'uri' => new Uri( '/rest/mock/MWBasicRequestAuthorizerTest/write' )
 		] );
-		$router = $this->createRouter( [ 'read' => true, 'writeapi' => true ], $request );
+		$router = $this->createRouter( [ 'read', 'writeapi' ], $request );
 		$response = $router->execute( $request );
 
 		$this->assertSame( 200, $response->getStatusCode() );