wikimedia/mediawiki-extensions-CodeMirror
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror synced 2024-11-23 22:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use $this->getServiceContainer() in tests and update class names

Browse source 
Consistently use
	$this->getServiceContainer()
instead of
	MediaWikiServices::getInstance()
in tests.

Also use namespaced classes
* MediaWiki\Output\OutputPage instead of OutputPage and
* MediaWiki\User\User instead of User.

Change-Id: I0cc39ba6cc706bf01581687e440ef9fb4ad39d81
This commit is contained in:
Fomafix 2023-10-11 19:53:54 +00:00
parent c0b01008a4
commit 6a37fedf73
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/phpunit/HookTest.php
View file

@ -6,12 +6,12 @@ use ExtensionRegistry;
use MediaWiki\Extension\CodeMirror\Hooks; use MediaWiki\Extension\CodeMirror\Hooks;
use MediaWiki\Extension\Gadgets\Gadget; use MediaWiki\Extension\Gadgets\Gadget;
use MediaWiki\Extension\Gadgets\GadgetRepo; use MediaWiki\Extension\Gadgets\GadgetRepo;
use MediaWiki\MediaWikiServices; use MediaWiki\Output\OutputPage;
use MediaWiki\Request\WebRequest; use MediaWiki\Request\WebRequest;
use MediaWiki\Title\Title; use MediaWiki\Title\Title;
use MediaWiki\User\User;
use MediaWiki\User\UserOptionsLookup; use MediaWiki\User\UserOptionsLookup;
use MediaWikiIntegrationTestCase; use MediaWikiIntegrationTestCase;
use OutputPage;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use RequestContext; use RequestContext;
use Skin; use Skin;
@ -47,7 +47,7 @@ class HookTest extends MediaWikiIntegrationTestCase {
->method( 'addModules' ) ->method( 'addModules' )
->withConsecutive( [ $this->equalTo( $expectedFirstModule ) ] ); ->withConsecutive( [ $this->equalTo( $expectedFirstModule ) ] );
( new Hooks( $userOptionsLookup, MediaWikiServices::getInstance()->getMainConfig() ) ) ( new Hooks( $userOptionsLookup, $this->getServiceContainer()->getMainConfig() ) )
->onBeforePageDisplay( $out, $this->createMock( Skin::class ) ); ->onBeforePageDisplay( $out, $this->createMock( Skin::class ) );
} }
@ -106,7 +106,7 @@ class HookTest extends MediaWikiIntegrationTestCase {
$hooks = new Hooks( $hooks = new Hooks(
$userOptionsLookup, $userOptionsLookup,
MediaWikiServices::getInstance()->getMainConfig() $this->getServiceContainer()->getMainConfig()
); );
self::assertSame( $expectation, $hooks->shouldLoadCodeMirror( $out, $extensionRegistry ) ); self::assertSame( $expectation, $hooks->shouldLoadCodeMirror( $out, $extensionRegistry ) );
} }
@ -127,7 +127,7 @@ class HookTest extends MediaWikiIntegrationTestCase {
*/ */
private function getMockOutputPage() { private function getMockOutputPage() {
$out = $this->createMock( OutputPage::class ); $out = $this->createMock( OutputPage::class );
$out->method( 'getUser' )->willReturn( $this->createMock( \User::class ) ); $out->method( 'getUser' )->willReturn( $this->createMock( User::class ) );
$out->method( 'getActionName' )->willReturn( 'edit' ); $out->method( 'getActionName' )->willReturn( 'edit' );
$out->method( 'getTitle' )->willReturn( Title::makeTitle( NS_MAIN, __METHOD__ ) ); $out->method( 'getTitle' )->willReturn( Title::makeTitle( NS_MAIN, __METHOD__ ) );
$request = $this->createMock( WebRequest::class ); $request = $this->createMock( WebRequest::class );