From 639176e01b66e1d37891cd199acbf9881484232f Mon Sep 17 00:00:00 2001 From: Fomafix Date: Fri, 31 Mar 2017 15:24:14 +0200 Subject: [PATCH] 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 --- .../includes/resourceloader/ResourceLoaderModuleTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php index 6751f4dc2a..17861d8929 100644 --- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php +++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php @@ -76,11 +76,11 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase { '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 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase { 'script' => "\n'valid';" ] ); $this->assertEquals( - $module->getScript( $context ), "\n'valid';", + $module->getScript( $context ), 'Leave valid scripts as-is' ); } @@ -120,13 +120,13 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase { '../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' ); } -- 2.20.1