From: umherirrender <umherirrender_de.wp@web.de>
Date: Mon, 7 Dec 2015 16:38:28 +0000 (+0100)
Subject: Fix phpunit for wikis with $wgResourceLoaderValidateJS = false
X-Git-Tag: 1.31.0-rc.0~8776
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=1647bb07fcc6c590087b286160592db5d2f36713;p=lhc%2Fweb%2Fwiklou.git

Fix phpunit for wikis with $wgResourceLoaderValidateJS = false

1) ResourceLoaderModuleTest::testValidateScriptFile
Replace invalid syntax with error logging
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'var a = 'this is';
- {
-invalid'
+'mw.log.error("JavaScript parse error: Parse error: Unexpected token;
token } expected in file 'input' on line 3");'

Change-Id: I0271de4bf2d5bcc50eaf5c0e999e16e554985805
---

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
index f700348348..c49d70123c 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
@@ -69,6 +69,8 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
 	 * @covers ResourceLoaderModule::validateScriptFile
 	 */
 	public function testValidateScriptFile() {
+		$this->setMwGlobals( 'wgResourceLoaderValidateJS', true );
+
 		$context = $this->getResourceLoaderContext();
 
 		$module = new ResourceLoaderTestModule( array(