From e03f7c3e8290d91e6a2f6c3e2576e5a1fffb171d Mon Sep 17 00:00:00 2001 From: Fomafix Date: Fri, 26 Jul 2024 12:45:47 +0000 Subject: [PATCH] Use overrideConfigValue/overrideConfigValues instead of setMwGlobals Also use MainConfigNames. Change-Id: I80d6b3ef9d7b857e35d8f93f424db1cfca1301f6 --- .../ApiEchoPushSubscriptionsCreateTest.php | 6 ++-- .../ApiEchoPushSubscriptionsDeleteTest.php | 6 ++-- .../Api/Push/ApiEchoPushSubscriptionsTest.php | 2 +- .../Controller/NotificationControllerTest.php | 30 ++++++++----------- tests/phpunit/EchoHooksTest.php | 7 +++-- .../phpunit/Mapper/NotificationMapperTest.php | 3 +- tests/phpunit/NotifUserTest.php | 5 ++-- .../Push/SubscriptionManagerTest.php | 2 +- 8 files changed, 30 insertions(+), 31 deletions(-) diff --git a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsCreateTest.php b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsCreateTest.php index 4b9f9f654..905a02398 100644 --- a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsCreateTest.php +++ b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsCreateTest.php @@ -18,9 +18,9 @@ class ApiEchoPushSubscriptionsCreateTest extends ApiTestCase { protected function setUp(): void { parent::setUp(); - $this->setMwGlobals( [ - 'wgEchoEnablePush' => true, - 'wgEchoPushMaxSubscriptionsPerUser' => 2 + $this->overrideConfigValues( [ + 'EchoEnablePush' => true, + 'EchoPushMaxSubscriptionsPerUser' => 2, ] ); $this->user = $this->getTestUser()->getUser(); $this->createTestData(); diff --git a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsDeleteTest.php b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsDeleteTest.php index 1843647d1..55b6aa943 100644 --- a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsDeleteTest.php +++ b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsDeleteTest.php @@ -24,9 +24,9 @@ class ApiEchoPushSubscriptionsDeleteTest extends ApiTestCase { protected function setUp(): void { parent::setUp(); - $this->setMwGlobals( [ - 'wgEchoEnablePush' => true, - 'wgEchoPushMaxSubscriptionsPerUser' => 3 + $this->overrideConfigValues( [ + 'EchoEnablePush' => true, + 'EchoPushMaxSubscriptionsPerUser' => 3, ] ); // Use mutable users for our generic users so we don't get two references to the same User diff --git a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsTest.php b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsTest.php index cba70296c..fd93b63cf 100644 --- a/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsTest.php +++ b/tests/phpunit/Api/Push/ApiEchoPushSubscriptionsTest.php @@ -10,7 +10,7 @@ use MediaWiki\Tests\Api\ApiTestCase; class ApiEchoPushSubscriptionsTest extends ApiTestCase { public function testRequiresToken(): void { - $this->setMwGlobals( 'wgEchoEnablePush', true ); + $this->overrideConfigValue( 'EchoEnablePush', true ); $params = [ 'action' => 'echopushsubscriptions', 'command' => 'create', diff --git a/tests/phpunit/Controller/NotificationControllerTest.php b/tests/phpunit/Controller/NotificationControllerTest.php index 2f97783ba..cafb7bb63 100644 --- a/tests/phpunit/Controller/NotificationControllerTest.php +++ b/tests/phpunit/Controller/NotificationControllerTest.php @@ -81,11 +81,9 @@ class NotificationControllerTest extends MediaWikiIntegrationTestCase { * @dataProvider evaluateUserLocatorsProvider */ public function testEvaluateUserLocators( $message, $expect, $locatorConfigForEventType, $setup = null ) { - $this->setMwGlobals( [ - 'wgEchoNotifications' => [ - 'unit-test' => [ - AttributeManager::ATTR_LOCATORS => $locatorConfigForEventType - ], + $this->overrideConfigValue( 'EchoNotifications', [ + 'unit-test' => [ + AttributeManager::ATTR_LOCATORS => $locatorConfigForEventType ], ] ); @@ -153,13 +151,11 @@ class NotificationControllerTest extends MediaWikiIntegrationTestCase { $expect, $users ) { - $this->setMwGlobals( [ - 'wgEchoNotifications' => [ - 'unit-test' => [ - AttributeManager::ATTR_LOCATORS => static function () use ( $users ) { - return $users; - }, - ], + $this->overrideConfigValue( 'EchoNotifications', [ + 'unit-test' => [ + AttributeManager::ATTR_LOCATORS => static function () use ( $users ) { + return $users; + }, ], ] ); @@ -249,11 +245,11 @@ class NotificationControllerTest extends MediaWikiIntegrationTestCase { array $notifyTypeAvailabilityByCategory, array $notifications ) { - $this->setMwGlobals( [ - 'wgDefaultNotifyTypeAvailability' => $defaultNotifyTypeAvailability, - 'wgNotifyTypeAvailabilityByCategory' => $notifyTypeAvailabilityByCategory, - 'wgEchoNotifications' => $notifications, - 'wgEchoNotificationCategories' => array_fill_keys( + $this->overrideConfigValues( [ + 'DefaultNotifyTypeAvailability' => $defaultNotifyTypeAvailability, + 'NotifyTypeAvailabilityByCategory' => $notifyTypeAvailabilityByCategory, + 'EchoNotifications' => $notifications, + 'EchoNotificationCategories' => array_fill_keys( array_keys( $notifyTypeAvailabilityByCategory ), [ 'priority' => 4 ] ), diff --git a/tests/phpunit/EchoHooksTest.php b/tests/phpunit/EchoHooksTest.php index 72f6c08cd..c621fd8ab 100644 --- a/tests/phpunit/EchoHooksTest.php +++ b/tests/phpunit/EchoHooksTest.php @@ -2,14 +2,15 @@ use MediaWiki\Extension\Notifications\Hooks as EchoHooks; use MediaWiki\Extension\Notifications\Services; +use MediaWiki\MainConfigNames; class EchoHooksTest extends MediaWikiIntegrationTestCase { /** * @covers \MediaWiki\Extension\Notifications\Hooks::onUserGetDefaultOptions() */ public function testOnUserGetDefaultOptions() { - $this->setMwGlobals( [ - 'wgEchoNotificationCategories' => [ + $this->overrideConfigValues( [ + 'EchoNotificationCategories' => [ 'emailuser' => [ 'priority' => 9, 'tooltip' => 'echo-pref-tooltip-emailuser', @@ -28,7 +29,7 @@ class EchoHooksTest extends MediaWikiIntegrationTestCase { 'priority' => 9001, ], ], - 'wgAllowHTMLEmail' => true, + MainConfigNames::AllowHTMLEmail => true, ] ); $defaults = [ diff --git a/tests/phpunit/Mapper/NotificationMapperTest.php b/tests/phpunit/Mapper/NotificationMapperTest.php index 348d0d8db..bbcb06d80 100644 --- a/tests/phpunit/Mapper/NotificationMapperTest.php +++ b/tests/phpunit/Mapper/NotificationMapperTest.php @@ -3,6 +3,7 @@ use MediaWiki\Extension\Notifications\DbFactory; use MediaWiki\Extension\Notifications\Mapper\NotificationMapper; use MediaWiki\Extension\Notifications\Model\Notification; +use MediaWiki\MainConfigNames; use MediaWiki\User\User; use Wikimedia\Rdbms\DeleteQueryBuilder; use Wikimedia\Rdbms\FakeResultWrapper; @@ -114,7 +115,7 @@ class NotificationMapperTest extends MediaWikiIntegrationTestCase { } public function testDeleteByUserEventOffset() { - $this->setMwGlobals( [ 'wgUpdateRowsPerQuery' => 4 ] ); + $this->overrideConfigValue( MainConfigNames::UpdateRowsPerQuery, 4 ); $mockDb = $this->createMock( IDatabase::class ); $makeResultRows = static function ( $eventIds ) { return new FakeResultWrapper( array_map( static function ( $eventId ) { diff --git a/tests/phpunit/NotifUserTest.php b/tests/phpunit/NotifUserTest.php index 14cf2c984..604bed9a1 100644 --- a/tests/phpunit/NotifUserTest.php +++ b/tests/phpunit/NotifUserTest.php @@ -7,6 +7,7 @@ use MediaWiki\Extension\Notifications\Mapper\TargetPageMapper; use MediaWiki\Extension\Notifications\Model\Event; use MediaWiki\Extension\Notifications\Model\Notification; use MediaWiki\Extension\Notifications\NotifUser; +use MediaWiki\MainConfigNames; use MediaWiki\User\Options\UserOptionsLookup; use MediaWiki\User\TalkPageNotificationManager; use MediaWiki\User\User; @@ -58,9 +59,9 @@ class NotifUserTest extends MediaWikiIntegrationTestCase { $this->setService( 'UserOptionsLookup', $userOptionsLookup ); $notifUser = NotifUser::newFromUser( $user ); - $this->setMwGlobals( 'wgAllowHTMLEmail', true ); + $this->overrideConfigValue( MainConfigNames::AllowHTMLEmail, true ); $this->assertEquals( $notifUser->getEmailFormat(), $pref ); - $this->setMwGlobals( 'wgAllowHTMLEmail', false ); + $this->overrideConfigValue( MainConfigNames::AllowHTMLEmail, false ); $this->assertEquals( EmailFormat::PLAIN_TEXT, $notifUser->getEmailFormat() ); } diff --git a/tests/phpunit/integration/Push/SubscriptionManagerTest.php b/tests/phpunit/integration/Push/SubscriptionManagerTest.php index 57563ce67..0395be6c7 100644 --- a/tests/phpunit/integration/Push/SubscriptionManagerTest.php +++ b/tests/phpunit/integration/Push/SubscriptionManagerTest.php @@ -12,7 +12,7 @@ class SubscriptionManagerTest extends MediaWikiIntegrationTestCase { protected function setUp(): void { parent::setUp(); - $this->setMwGlobals( 'wgEchoPushMaxSubscriptionsPerUser', 1 ); + $this->overrideConfigValue( 'EchoPushMaxSubscriptionsPerUser', 1 ); } public function testManagePushSubscriptions(): void {