wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 07:54:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "tests: Small changes to DiscussionParserTest"

Browse source
This commit is contained in:
jenkins-bot 2023-08-29 19:26:56 +00:00 committed by Gerrit Code Review
parent 80c2f99c54 0b95ded538
commit 76f5ed4691
1 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/phpunit/DiscussionParserTest.php
View file

@ -4,7 +4,7 @@
use MediaWiki\Extension\Notifications\DiscussionParser; use MediaWiki\Extension\Notifications\DiscussionParser;
use MediaWiki\Extension\Notifications\Model\Event; use MediaWiki\Extension\Notifications\Model\Event;
use MediaWiki\MediaWikiServices; use MediaWiki\MainConfigNames;
use MediaWiki\Revision\MutableRevisionRecord; use MediaWiki\Revision\MutableRevisionRecord;
use MediaWiki\Revision\SlotRecord; use MediaWiki\Revision\SlotRecord;
use Wikimedia\TestingAccessWrapper; use Wikimedia\TestingAccessWrapper;
@ -144,17 +144,8 @@ class DiscussionParserTest extends MediaWikiIntegrationTestCase {
], ],
]; ];
protected function setUp(): void {
parent::setUp();
$this->overrideConfigValue( 'Diff', false );
}
protected function tearDown(): void {
parent::tearDown();
}
private function setupAllTestUsers() { private function setupAllTestUsers() {
foreach ( array_keys( $this->testUsers ) as $username ) { foreach ( $this->testUsers as $username => $_ ) {
$this->setupTestUser( $username ); $this->setupTestUser( $username );
} }
} }
@ -174,7 +165,7 @@ class DiscussionParserTest extends MediaWikiIntegrationTestCase {
foreach ( $preferences as $option => $value ) { foreach ( $preferences as $option => $value ) {
$userOptionsManager->setOption( $user, $option, $value ); $userOptionsManager->setOption( $user, $option, $value );
} }
$user->saveSettings(); $userOptionsManager->saveOptions( $user );
} }
} }
@ -727,10 +718,12 @@ class DiscussionParserTest extends MediaWikiIntegrationTestCase {
} }
); );
// enable mention failure and success notifications $this->overrideConfigValues( [
$this->overrideConfigValue( 'EchoMentionStatusNotifications', true ); // enable mention failure and success notifications
// enable multiple sections mentions 'EchoMentionStatusNotifications' => true,
$this->overrideConfigValue( 'EchoMentionsOnMultipleSectionEdits', true ); // enable multiple sections mentions
'EchoMentionsOnMultipleSectionEdits' => true,
] );
$this->clearHook( 'EchoGetEventsForRevision' ); $this->clearHook( 'EchoGetEventsForRevision' );
DiscussionParser::generateEventsForRevision( $revision, false ); DiscussionParser::generateEventsForRevision( $revision, false );
@ -944,23 +937,22 @@ TEXT
private function setupTestRevisionsForEventGeneration( $newId, $oldId, $username, $lang, $pages, private function setupTestRevisionsForEventGeneration( $newId, $oldId, $username, $lang, $pages,
$title, $summary = '' $title, $summary = ''
) { ) {
$store = MediaWikiServices::getInstance()->getRevisionStore(); $services = $this->getServiceContainer();
$store = $services->getRevisionStore();
// Content language is used by the code that interprets the namespace part of titles // Content language is used by the code that interprets the namespace part of titles
// (Title::getTitleParser), so should be the fake language ;) // (Title::getTitleParser), so should be the fake language ;)
$this->setContentLang( $lang ); $this->setContentLang( $lang );
$this->overrideConfigValues( [ $this->overrideConfigValues( [
// this one allows Mediawiki:xyz pages to be set as messages // this one allows Mediawiki:xyz pages to be set as messages
'UseDatabaseMessages' => true MainConfigNames::UseDatabaseMessages => true
] ); ] );
$this->resetServices();
// pages to be created: templates may be used to ping users (e.g. // pages to be created: templates may be used to ping users (e.g.
// {{u|...}}) but if we don't have that template, it just won't work! // {{u|...}}) but if we don't have that template, it just won't work!
$pages += [ $title => '' ]; $pages += [ $title => '' ];
$user = $this->getTestUser()->getUser(); $user = $this->getTestUser()->getUser();
$wikiPageFactory = MediaWikiServices::getInstance()->getWikiPageFactory(); $wikiPageFactory = $services->getWikiPageFactory();
foreach ( $pages as $pageTitle => $pageText ) { foreach ( $pages as $pageTitle => $pageText ) {
$template = $wikiPageFactory->newFromTitle( Title::newFromText( $pageTitle ) ); $template = $wikiPageFactory->newFromTitle( Title::newFromText( $pageTitle ) );
$template->doUserEditContent( new WikitextContent( $pageText ), $user, '' ); $template->doUserEditContent( new WikitextContent( $pageText ), $user, '' );
@ -968,7 +960,7 @@ TEXT
// force i18n messages to be reloaded from MessageCache (from DB, where a new message // force i18n messages to be reloaded from MessageCache (from DB, where a new message
// might have been created as page) // might have been created as page)
$this->resetServices(); $services->resetServiceForTesting( 'MessageCache' );
// grab revision excerpts (didn't include them in this src file because // grab revision excerpts (didn't include them in this src file because
// they can be pretty long) // they can be pretty long)
@ -1029,7 +1021,7 @@ TEXT
} }
public function testTimestampRegex_T264922() { public function testTimestampRegex_T264922() {
$this->overrideConfigValue( 'LanguageCode', 'skr' ); $this->overrideConfigValue( MainConfigNames::LanguageCode, 'skr' );
$this->assertIsString( DiscussionParser::getTimestampRegex(), 'does not fail' ); $this->assertIsString( DiscussionParser::getTimestampRegex(), 'does not fail' );
} }