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

Cleanup SpecialBlockTest

Browse source 
Needs to call parent::tearDown() after the table reset.

Use direct assertion and MediaWikiTestCase abstraction
where possible

Change-Id: Iad00569867e6f9a4579ae93b22fc0f570cde6bd7
This commit is contained in:
Ammar Abdulhamid 2020-12-20 02:52:16 +01:00
parent 1b24634a17
commit 2bd536b83a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/phpunit/includes/specials/SpecialBlockTest.php
View file

@ -30,8 +30,8 @@ class SpecialBlockTest extends SpecialPageTestBase {
}
protected function tearDown() : void {
parent::tearDown();
$this->resetTables();
parent::tearDown();
}
/**
@ -214,7 +214,7 @@ class SpecialBlockTest extends SpecialPageTestBase {
$block = DatabaseBlock::newFromTarget( $badActor );
$this->assertSame( $reason, $block->getReasonComment()->text );
$this->assertSame( $expiry, $block->getExpiry() );
$this->assertSame( true, $block->isAutoblocking() );
$this->assertTrue( $block->isAutoblocking() );
}
/**
@ -805,10 +805,10 @@ class SpecialBlockTest extends SpecialPageTestBase {
// Getting errors about creating users in db in provider.
// Need to use mutable to ensure different named testusers.
$users = [
'u1' => TestUserRegistry::getMutableTestUser( __CLASS__, 'sysop' )->getUser(),
'u2' => TestUserRegistry::getMutableTestUser( __CLASS__, 'sysop' )->getUser(),
'u3' => TestUserRegistry::getMutableTestUser( __CLASS__, 'sysop' )->getUser(),
'u4' => TestUserRegistry::getMutableTestUser( __CLASS__, 'sysop' )->getUser(),
'u1' => $this->getMutableTestUser( 'sysop' )->getUser(),
'u2' => $this->getMutableTestUser( 'sysop' )->getUser(),
'u3' => $this->getMutableTestUser( 'sysop' )->getUser(),
'u4' => $this->getMutableTestUser( 'sysop' )->getUser(),
'nonsysop' => $this->getTestUser()->getUser()
];
foreach ( [ 'blockedUser', 'blockPerformer', 'adjustPerformer', 'adjustTarget' ] as $var ) {