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

Merge "Use expectException() in ActionTest"

Browse source
This commit is contained in:
jenkins-bot 2021-10-28 02:05:51 +00:00 committed by Gerrit Code Review
commit 8274d7dbd6
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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