diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2019-07-10 18:02:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2019-07-10 18:02:43 +0000 |
| commit | d72f24589b3eece35b334d080e6e609b048fc22f (patch) | |
| tree | 12bacfe75a3f288d6d2aef4f2e4d800229d7c43f /tests | |
| parent | c9db90712628d43573f47a2b32dca0778cd8f1f7 (diff) | |
| parent | 786a7a168a2ee79ce759970269233de17ec6f9d1 (diff) | |
| download | mediawikicore-d72f24589b3eece35b334d080e6e609b048fc22f.tar.gz mediawikicore-d72f24589b3eece35b334d080e6e609b048fc22f.zip | |
Merge "Pass in ServiceOptions to BlockManager"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/phpunit/includes/block/BlockManagerTest.php | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/tests/phpunit/includes/block/BlockManagerTest.php b/tests/phpunit/includes/block/BlockManagerTest.php index 0ed5cd6133a9..fe3bb88725c4 100644 --- a/tests/phpunit/includes/block/BlockManagerTest.php +++ b/tests/phpunit/includes/block/BlockManagerTest.php @@ -3,6 +3,8 @@ use MediaWiki\Block\BlockManager; use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\SystemBlock; +use MediaWiki\Config\ServiceOptions; +use MediaWiki\MediaWikiServices; /** * @group Blocking @@ -36,14 +38,25 @@ class BlockManagerTest extends MediaWikiTestCase { } private function getBlockManager( $overrideConfig ) { - $blockManagerConfig = array_merge( $this->blockManagerConfig, $overrideConfig ); return new BlockManager( - $this->user, - $this->user->getRequest(), - ...array_values( $blockManagerConfig ) + ...$this->getBlockManagerConstructorArgs( $overrideConfig ) ); } + private function getBlockManagerConstructorArgs( $overrideConfig ) { + $blockManagerConfig = array_merge( $this->blockManagerConfig, $overrideConfig ); + $this->setMwGlobals( $blockManagerConfig ); + $this->overrideMwServices(); + return [ + new ServiceOptions( + BlockManager::$constructorOptions, + MediaWikiServices::getInstance()->getMainConfig() + ), + $this->user, + $this->user->getRequest() + ]; + } + /** * @dataProvider provideGetBlockFromCookieValue * @covers ::getBlockFromCookieValue @@ -179,18 +192,14 @@ class BlockManagerTest extends MediaWikiTestCase { * @covers ::inDnsBlacklist */ public function testIsDnsBlacklisted( $options, $expected ) { - $blockManagerConfig = array_merge( $this->blockManagerConfig, [ + $blockManagerConfig = [ 'wgEnableDnsBlacklist' => true, 'wgDnsBlacklistUrls' => $options['blacklist'], 'wgProxyWhitelist' => $options['whitelist'], - ] ); + ]; $blockManager = $this->getMockBuilder( BlockManager::class ) - ->setConstructorArgs( - array_merge( [ - $this->user, - $this->user->getRequest(), - ], $blockManagerConfig ) ) + ->setConstructorArgs( $this->getBlockManagerConstructorArgs( $blockManagerConfig ) ) ->setMethods( [ 'checkHost' ] ) ->getMock(); |