wikimedia/mediawiki-extensions-Popups
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups synced 2024-11-30 18:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Avoid using TestUser in non-Database tests"

Browse source
This commit is contained in:
jenkins-bot 2023-08-10 08:45:46 +00:00 committed by Gerrit Code Review
parent 39db791d9d c581aab15e
commit 0c1fc73908
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/phpunit/PopupsContextTest.php
View file

@ -19,6 +19,7 @@
* @ingroup extensions * @ingroup extensions
*/ */
use MediaWiki\User\UserOptionsLookup;
use PHPUnit\Framework\MockObject\Stub\ConsecutiveCalls; use PHPUnit\Framework\MockObject\Stub\ConsecutiveCalls;
use Popups\PopupsContext; use Popups\PopupsContext;
use Popups\PopupsGadgetsIntegration; use Popups\PopupsGadgetsIntegration;
@ -94,8 +95,8 @@ class PopupsContextTest extends MediaWikiIntegrationTestCase {
* @covers ::shouldSendModuleToUser * @covers ::shouldSendModuleToUser
*/ */
public function testShouldSendToAnonUser() { public function testShouldSendToAnonUser() {
$user = $this->getMutableTestUser()->getUser(); $user = $this->createMock( User::class );
$user->setId( self::ANONYMOUS_USER ); $user->method( 'getId' )->willReturn( self::ANONYMOUS_USER );
$context = $this->getContext(); $context = $this->getContext();
$this->assertTrue( $this->assertTrue(
@ -118,10 +119,15 @@ class PopupsContextTest extends MediaWikiIntegrationTestCase {
'wgPopupsReferencePreviews' => false, 'wgPopupsReferencePreviews' => false,
] ); ] );
$user = $this->createMock( User::class );
$user->method( 'isNamed' )->willReturn( true );
$userOptLookup = $this->createMock( UserOptionsLookup::class );
$userOptLookup->method( 'getBoolOption' )
->with( $user, PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME )
->willReturn( $optIn );
$this->setService( 'UserOptionsLookup', $userOptLookup );
$context = $this->getContext(); $context = $this->getContext();
$user = $this->getMutableTestUser()->getUser();
$userOptionsManager = $this->getServiceContainer()->getUserOptionsManager();
$userOptionsManager->setOption( $user, PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME, $optIn );
$this->assertSame( $expected, $this->assertSame( $expected,
$context->shouldSendModuleToUser( $user ), $context->shouldSendModuleToUser( $user ),
( $expected ? 'A' : 'No' ) . ' module is sent to the user.' ); ( $expected ? 'A' : 'No' ) . ' module is sent to the user.' );
@ -252,7 +258,7 @@ class PopupsContextTest extends MediaWikiIntegrationTestCase {
public function testConflictsWithNavPopupsGadget() { public function testConflictsWithNavPopupsGadget() {
$integrationMock = $this->createMock( PopupsGadgetsIntegration::class ); $integrationMock = $this->createMock( PopupsGadgetsIntegration::class );
$user = $this->getTestUser()->getUser(); $user = $this->createMock( User::class );
$integrationMock->expects( $this->once() ) $integrationMock->expects( $this->once() )
->method( 'conflictsWithNavPopupsGadget' ) ->method( 'conflictsWithNavPopupsGadget' )
@ -301,7 +307,7 @@ class PopupsContextTest extends MediaWikiIntegrationTestCase {
$this->assertSame( $this->assertSame(
$expected, $expected,
$contextMock->getConfigBitmaskFromUser( $this->getTestUser()->getUser() ) $contextMock->getConfigBitmaskFromUser( $this->createMock( User::class ) )
); );
} }

2
tests/phpunit/unit/PopupsGadgetsIntegrationTest.php → tests/phpunit/PopupsGadgetsIntegrationTest.php
View file

@ -27,7 +27,7 @@ use Popups\PopupsGadgetsIntegration;
* @group Popups * @group Popups
* @coversDefaultClass \Popups\PopupsGadgetsIntegration * @coversDefaultClass \Popups\PopupsGadgetsIntegration
*/ */
class PopupsGadgetsIntegrationTest extends MediaWikiUnitTestCase { class PopupsGadgetsIntegrationTest extends MediaWikiIntegrationTestCase {
/** /**
* Gadget name for testing * Gadget name for testing

10
tests/phpunit/PopupsHooksTest.php
View file

@ -46,7 +46,7 @@ class PopupsHooksTest extends MediaWikiIntegrationTestCase {
$userOptionsManager = $this->getServiceContainer()->getUserOptionsManager(); $userOptionsManager = $this->getServiceContainer()->getUserOptionsManager();
( new PopupsHooks( $userOptionsManager ) ) ( new PopupsHooks( $userOptionsManager ) )
->onGetPreferences( $this->getTestUser()->getUser(), $prefs ); ->onGetPreferences( $this->createMock( User::class ), $prefs );
$this->assertCount( 1, $prefs, 'No preferences are retrieved.' ); $this->assertCount( 1, $prefs, 'No preferences are retrieved.' );
$this->assertSame( 'notEmpty', $this->assertSame( 'notEmpty',
$prefs[ 'someNotEmptyValue'], $prefs[ 'someNotEmptyValue'],
@ -57,7 +57,7 @@ class PopupsHooksTest extends MediaWikiIntegrationTestCase {
* @covers ::onGetPreferences * @covers ::onGetPreferences
*/ */
public function testOnGetPreferencesNavPopupGadgetIsOn() { public function testOnGetPreferencesNavPopupGadgetIsOn() {
$userMock = $this->getTestUser()->getUser(); $userMock = $this->createMock( User::class );
$contextMock = $this->createMock( PopupsContext::class ); $contextMock = $this->createMock( PopupsContext::class );
$contextMock->expects( $this->once() ) $contextMock->expects( $this->once() )
@ -73,7 +73,7 @@ class PopupsHooksTest extends MediaWikiIntegrationTestCase {
$userOptionsManager = $this->getServiceContainer()->getUserOptionsManager(); $userOptionsManager = $this->getServiceContainer()->getUserOptionsManager();
( new PopupsHooks( $userOptionsManager ) ) ( new PopupsHooks( $userOptionsManager ) )
->onGetPreferences( $this->getTestUser()->getUser(), $prefs ); ->onGetPreferences( $userMock, $prefs );
$this->assertArrayHasKey( PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME, $this->assertArrayHasKey( PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME,
$prefs, $prefs,
'The opt-in preference is retrieved.' ); 'The opt-in preference is retrieved.' );
@ -108,7 +108,7 @@ class PopupsHooksTest extends MediaWikiIntegrationTestCase {
$userOptionsManager = $this->getServiceContainer()->getUserOptionsManager(); $userOptionsManager = $this->getServiceContainer()->getUserOptionsManager();
( new PopupsHooks( $userOptionsManager ) ) ( new PopupsHooks( $userOptionsManager ) )
->onGetPreferences( $this->getTestUser()->getUser(), $prefs ); ->onGetPreferences( $this->createMock( User::class ), $prefs );
$this->assertGreaterThan( 3, count( $prefs ), 'A preference is retrieved.' ); $this->assertGreaterThan( 3, count( $prefs ), 'A preference is retrieved.' );
$this->assertSame( 'notEmpty', $this->assertSame( 'notEmpty',
$prefs[ 'someNotEmptyValue'], $prefs[ 'someNotEmptyValue'],
@ -142,7 +142,7 @@ class PopupsHooksTest extends MediaWikiIntegrationTestCase {
$userOptionsManager = $this->getServiceContainer()->getUserOptionsManager(); $userOptionsManager = $this->getServiceContainer()->getUserOptionsManager();
( new PopupsHooks( $userOptionsManager ) ) ( new PopupsHooks( $userOptionsManager ) )
->onGetPreferences( $this->getTestUser()->getUser(), $prefs ); ->onGetPreferences( $this->createMock( User::class ), $prefs );
$this->assertGreaterThan( 2, count( $prefs ), 'A preference is retrieved.' ); $this->assertGreaterThan( 2, count( $prefs ), 'A preference is retrieved.' );
$this->assertArrayHasKey( PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME, $this->assertArrayHasKey( PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME,
$prefs, $prefs,