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

Use $this->setRequest and $this->setGroupPermissions in PHPUnit tests

Browse source 
Change-Id: I3d28431029ba0569950ffea68f18f24daaf59079
This commit is contained in:
Fomafix 2024-07-11 12:18:56 +00:00
parent d37aef508e
commit e30bfd1484
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/phpunit/includes/Output/OutputPageTest.php
View file

@ -315,10 +315,8 @@ class OutputPageTest extends MediaWikiIntegrationTestCase {
'action' => $action,
'variant' => $urlVariant,
] );
$this->overrideConfigValues( [
MainConfigNames::LanguageCode => 'zh',
'Request' => $req, # LanguageConverter is using global state...
] );
$this->setRequest( $req );
$this->overrideConfigValue( MainConfigNames::LanguageCode, 'zh' );
$op = $this->newInstance( [ MainConfigNames::EnableCanonicalServerLink => true ], $req );
$bcp47 = LanguageCode::bcp47( $altUrlLangCode );
$bcp47Lowercase = strtolower( $bcp47 );

10
tests/phpunit/includes/filerepo/ThumbnailEntryPointTest.php
View file

@ -362,10 +362,7 @@ class ThumbnailEntryPointTest extends MediaWikiIntegrationTestCase {
public function testAccessDenied() {
// Make the wiki non-public
$groupPermissions = $this->getConfVar( MainConfigNames::GroupPermissions );
$groupPermissions['*']['read'] = false;
$this->overrideConfigValue( MainConfigNames::GroupPermissions, $groupPermissions );
$this->setGroupPermissions( '*', 'read', false );
// Make the user have no rights
$authority = new SimpleAuthority(
@ -400,10 +397,7 @@ class ThumbnailEntryPointTest extends MediaWikiIntegrationTestCase {
public function testAccessOnPrivateWiki() {
// Make the wiki non-public, so we don't use the short-circuit code
$groupPermissions = $this->getConfVar( MainConfigNames::GroupPermissions );
$groupPermissions['*']['read'] = false;
$this->overrideConfigValue( MainConfigNames::GroupPermissions, $groupPermissions );
$this->setGroupPermissions( '*', 'read', false );
// Make a user who is allowed to read
$authority = new SimpleAuthority(