jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/345833 )
Change subject: ResourceLoaderModuleTest: Exchange expected and actual parameter ...................................................................... ResourceLoaderModuleTest: Exchange expected and actual parameter For assertEquals of PHPUnit the first parameter is $expected and the second parameter is $actual. https://phpunit.de/manual/current/en/appendixes.assertions.html#appendixes.assertions.assertEquals Change-Id: Iad4b37ee74a03aa00f2dc14d3c474796b3191b51 --- M tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php index 6751f4d..17861d8 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php @@ -76,11 +76,11 @@ 'script' => "var a = 'this is';\n {\ninvalid" ] ); $this->assertEquals( - $module->getScript( $context ), 'mw.log.error(' . '"JavaScript parse error: Parse error: Unexpected token; ' . 'token } expected in file \'input\' on line 3"' . ');', + $module->getScript( $context ), 'Replace invalid syntax with error logging' ); @@ -88,8 +88,8 @@ 'script' => "\n'valid';" ] ); $this->assertEquals( - $module->getScript( $context ), "\n'valid';", + $module->getScript( $context ), 'Leave valid scripts as-is' ); } @@ -120,13 +120,13 @@ '../skins/Example/images/quux.png', ]; $this->assertEquals( - $getRelativePaths->invoke( null, $raw ), $canonical, + $getRelativePaths->invoke( null, $raw ), 'Insert placeholders' ); $this->assertEquals( - $expandRelativePaths->invoke( null, $canonical ), $raw, + $expandRelativePaths->invoke( null, $canonical ), 'Substitute placeholders' ); } -- To view, visit https://gerrit.wikimedia.org/r/345833 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad4b37ee74a03aa00f2dc14d3c474796b3191b51 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Fomafix <foma...@googlemail.com> Gerrit-Reviewer: Fomafix <foma...@googlemail.com> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
