wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-24 08:23:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Ignore warnings about legacy IDs in tests"

Browse source
This commit is contained in:
jenkins-bot 2021-03-20 15:28:20 +00:00 committed by Gerrit Code Review
parent d1f35546b8 a103abb8ae
commit 37979df1a1
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/CommentParser.php
View file

@ -1149,7 +1149,7 @@ class CommentParser {
if ( isset( $this->threadItemsById[$id] ) ) {
// Well, that's tough
$threadItem->addWarning( 'Duplicate comment ID' );
$threadItem->addWarning( 'Duplicate comment legacy ID' );
// Finally, disambiguate by adding sequential numbers, to allow replying to both comments
$number = 1;
while ( isset( $this->threadItemsById["$id|$number"] ) ) {

2
tests/phpunit/CommentParserTest.php
View file

@ -89,6 +89,8 @@ class CommentParserTest extends IntegrationTestCase {
$serialized->id = $threadItem->getId();
$serialized->warnings = $threadItem->getWarnings();
// Ignore warnings about legacy IDs (we don't have them in JS)
$serialized->warnings = array_values( array_diff( $serialized->warnings, [ 'Duplicate comment legacy ID' ] ) );
$serialized->replies = [];
foreach ( $threadItem->getReplies() as $reply ) {