Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use expectException() in ActionTest

Browse source 
This way the intent is clearer, and it also properly covers the case
where the exception isn't thrown.

Change-Id: I7831382956d5bc204b695fecc47f7111519d53af
This commit is contained in:
Daimona Eaytoy 2021-10-28 03:05:43 +02:00
parent 9b05a56a5d
commit 55b1c430ed
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/phpunit/includes/actions/ActionTest.php
View file

@ -269,11 +269,8 @@ class ActionTest extends MediaWikiIntegrationTestCase {
$user = $this->getTestUser()->getUser(); $user = $this->getTestUser()->getUser();
$this->overrideUserPermissions( $user, [] ); $this->overrideUserPermissions( $user, [] );
$action = $this->getAction( 'access' ); $action = $this->getAction( 'access' );
try { $this->expectException( PermissionsError::class );
$action->canExecute( $user ); $action->canExecute( $user );
} catch ( Exception $e ) {
$this->assertInstanceOf( PermissionsError::class, $e );
}
} }
public function testCanExecuteRequiresUnblock() { public function testCanExecuteRequiresUnblock() {
@ -297,12 +294,8 @@ class ActionTest extends MediaWikiIntegrationTestCase {
->method( 'getBlock' ) ->method( 'getBlock' )
->willReturn( $block ); ->willReturn( $block );
try { $this->expectException( UserBlockedError::class );
$action->canExecute( $user ); $action->canExecute( $user );
$this->assertFalse( true );
} catch ( Exception $e ) {
$this->assertInstanceOf( UserBlockedError::class, $e );
}
} }
} }