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

tests: Change some setMwGlobals to overrideConfigValue

Browse source 
Change-Id: I21b9bf907e313947360b1607f11ae9917488f109
This commit is contained in:
Umherirrender 2023-07-17 23:02:32 +02:00
parent 6853d8b390
commit d2a09384a7
7 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/phpunit/includes/HtmlTest.php
View file

@ -838,7 +838,7 @@ class HtmlTest extends MediaWikiIntegrationTestCase {
$classAttribute,
$expectedClassAttribute
) {
$this->setMwGlobals( 'wgUseMediaWikiUIEverywhere', $useMediaWikiUIEverywhere );
$this->overrideConfigValue( MainConfigNames::UseMediaWikiUIEverywhere, $useMediaWikiUIEverywhere );
$attrs = Html::getTextInputAttributes( [ 'class' => $classAttribute ] );
$this->assertSame( $expectedClassAttribute, $attrs['class'] );
}

9
tests/phpunit/includes/Navigation/PagerNavigationBuilderTest.php
View file

@ -1,5 +1,6 @@
<?php
use MediaWiki\MainConfigNames;
use MediaWiki\Navigation\PagerNavigationBuilder;
use MediaWiki\Page\PageReferenceValue;
@ -11,10 +12,10 @@ class PagerNavigationBuilderTest extends MediaWikiIntegrationTestCase {
protected function setUp(): void {
parent::setUp();
$this->setMwGlobals( [
'wgArticlePath' => '/wiki/$1',
'wgScriptPath' => '/w',
'wgScript' => '/w/index.php',
$this->overrideConfigValues( [
MainConfigNames::ArticlePath => '/wiki/$1',
MainConfigNames::ScriptPath => '/w',
MainConfigNames::Script => '/w/index.php',
] );
}

4
tests/phpunit/includes/objectcache/ObjectCacheTest.php
View file

@ -125,8 +125,8 @@ class ObjectCacheTest extends MediaWikiIntegrationTestCase {
$this->setCacheConfig( [
'db-replicated' => MainConfigSchema::ObjectCaches['default']['db-replicated']
] );
$this->setMwGlobals( [
'wgMainCacheType' => $mainCacheType
$this->overrideConfigValues( [
MainConfigNames::MainCacheType => $mainCacheType
] );
$this->assertSame( $expected, ObjectCache::isDatabaseId( $id ) );
}

6
tests/phpunit/includes/parser/MagicVariableTest.php
View file

@ -30,9 +30,9 @@ class MagicVariableTest extends MediaWikiIntegrationTestCase {
protected function setUp(): void {
parent::setUp();
$this->setMwGlobals( [
'wgMiserMode' => false,
'wgParserCacheExpireTime' => 86400 * 7,
$this->overrideConfigValues( [
MainConfigNames::MiserMode => false,
MainConfigNames::ParserCacheExpireTime => 86400 * 7,
] );
$services = $this->getServiceContainer();

3
tests/phpunit/includes/specials/SpecialMyLanguageTest.php
View file

@ -1,5 +1,6 @@
<?php
use MediaWiki\MainConfigNames;
use MediaWiki\Specials\SpecialMyLanguage;
use MediaWiki\Title\Title;
@ -60,7 +61,7 @@ class SpecialMyLanguageTest extends MediaWikiIntegrationTestCase {
$services->getRedirectLookup()
);
$special->getContext()->setLanguage( $userLang );
$this->setMwGlobals( 'wgPageLanguageUseDB', true );
$this->overrideConfigValue( MainConfigNames::PageLanguageUseDB, true );
// Test with subpages both enabled and disabled
$this->mergeMwGlobalArrayValue( 'wgNamespacesWithSubpages', [ NS_MAIN => true ] );
$this->assertTitle( $expected, $special->findTitle( $subpage ) );

3
tests/phpunit/integration/includes/Rest/Handler/MediaFileHandlerTest.php
View file

@ -2,6 +2,7 @@
namespace MediaWiki\Tests\Rest\Handler;
use MediaWiki\MainConfigNames;
use MediaWiki\Rest\Handler\MediaFileHandler;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\RequestData;
@ -43,7 +44,7 @@ class MediaFileHandlerTest extends \MediaWikiLangTestCase {
$user = RequestContext::getMain()->getUser();
$userOptionsManager = $this->getServiceContainer()->getUserOptionsManager();
$this->setMwGlobals( 'wgImageLimits', [
$this->overrideConfigValue( MainConfigNames::ImageLimits, [
$userOptionsManager->getIntOption( $user, 'imagesize' ) => [ 100, 100 ],
$userOptionsManager->getIntOption( $user, 'thumbsize' ) => [ 20, 20 ],
] );

3
tests/phpunit/integration/includes/Rest/Handler/MediaLinksHandlerTest.php
View file

@ -2,6 +2,7 @@
namespace MediaWiki\Tests\Rest\Handler;
use MediaWiki\MainConfigNames;
use MediaWiki\Rest\Handler\MediaLinksHandler;
use MediaWiki\Rest\LocalizedHttpException;
use MediaWiki\Rest\RequestData;
@ -43,7 +44,7 @@ class MediaLinksHandlerTest extends \MediaWikiIntegrationTestCase {
$user = RequestContext::getMain()->getUser();
$userOptionsManager = $this->getServiceContainer()->getUserOptionsManager();
$this->setMwGlobals( 'wgImageLimits', [
$this->overrideConfigValue( MainConfigNames::ImageLimits, [
$userOptionsManager->getIntOption( $user, 'imagesize' ) => [ 100, 100 ],
] );