wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-09-24 10:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "tests: Fix some issues with overwriting outputs from PHP tests"

Browse source
This commit is contained in:
jenkins-bot 2020-08-11 21:19:12 +00:00 committed by Gerrit Code Review
parent 9602209ade f0225243e0
commit 605b164616
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/phpunit/CommentParserTest.php
View file

@ -234,11 +234,14 @@ class CommentParserTest extends CommentTestCase {
$thread = self::serializeComments( $thread, $body );
$thread = json_decode( json_encode( $thread ), true );
$processedThreads[] = $thread;
self::assertEquals( $expected[$i], $processedThreads[$i], $name . ' section ' . $i );
}
// Uncomment this to write updated content to the JSON files:
// self::overwriteJsonFile( $expectedPath, $processedThreads );
foreach ( $threads as $i => $thread ) {
self::assertEquals( $expected[$i], $processedThreads[$i], $name . ' section ' . $i );
}
}
public function provideComments() : array {

4
tests/phpunit/CommentTestCase.php
View file

@ -80,7 +80,7 @@ abstract class CommentTestCase extends MediaWikiTestCase {
protected static function overwriteHtmlFile( string $relPath, DOMDocument $doc, string $origRelPath ) : void {
// Do not use $doc->saveHtml(), it outputs an awful soup of HTML entities for documents with
// non-ASCII characters
$html = file_get_contents( __DIR__ . '/../' . $origRelativePath );
$html = file_get_contents( __DIR__ . '/../' . $origRelPath );
// Replace the body tag only in full Parsoid docs
if ( strpos( $html, '<body' ) !== false ) {
@ -95,7 +95,7 @@ abstract class CommentTestCase extends MediaWikiTestCase {
$html = DOMCompat::getInnerHTML( $doc->getElementsByTagName( 'body' )->item( 0 ) );
}
file_put_contents( __DIR__ . '/../' . $relativePath, $html );
file_put_contents( __DIR__ . '/../' . $relPath, $html );
}
/**

6
tests/phpunit/ThreadItemTest.php
View file

@ -74,14 +74,14 @@ class ThreadItemTest extends CommentTestCase {
$transcludedFrom[ $comment->getId() ] = $comment->getTranscludedFrom();
}
// Uncomment this to write updated content to the JSON files:
// self::overwriteJsonFile( $expectedPath, $transcludedFrom );
self::assertEquals(
$expected,
$transcludedFrom,
$name
);
// Uncomment this to write updated content to the JSON files:
// self::overwriteJsonFile( $expectedPath, $transcludedFrom );
}
public function provideTranscludedFrom() : array {