From 1e4336d43592f0ccb6831ad100e4a01310ce5efe Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 2 Jun 2015 23:48:47 +0100
Subject: [PATCH] resourceloader: Add unit test for validateScriptFile()

Follows-up cd0dff5c00.

Change-Id: Ie208e58053048e932ef3f61f849148b1d88bc0be
---
 tests/phpunit/ResourceLoaderTestCase.php      |  2 +-
 .../ResourceLoaderModuleTest.php              | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/tests/phpunit/ResourceLoaderTestCase.php b/tests/phpunit/ResourceLoaderTestCase.php
index 4d4e83f338..6346bb9965 100644
--- a/tests/phpunit/ResourceLoaderTestCase.php
+++ b/tests/phpunit/ResourceLoaderTestCase.php
@@ -76,7 +76,7 @@ class ResourceLoaderTestModule extends ResourceLoaderModule {
 	}
 
 	public function getScript( ResourceLoaderContext $context ) {
-		return $this->script;
+		return $this->validateScriptFile( 'input', $this->script );
 	}
 
 	public function getStyles( ResourceLoaderContext $context ) {
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
index 6d1ed4e05d..136ca6ef2f 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderModuleTest.php
@@ -70,4 +70,29 @@ class ResourceLoaderModuleTest extends ResourceLoaderTestCase {
 			'Class is significant'
 		);
 	}
+
+	/**
+	 * @covers ResourceLoaderModule::validateScriptFile
+	 */
+	public function testValidateScriptFile() {
+		$context = $this->getResourceLoaderContext();
+
+		$module = new ResourceLoaderTestModule( array(
+			'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");',
+			'Replace invalid syntax with error logging'
+		);
+
+		$module = new ResourceLoaderTestModule( array(
+			'script' => "\n'valid';"
+		) );
+		$this->assertEquals(
+			$module->getScript( $context ),
+			"\n'valid';",
+			'Leave valid scripts as-is'
+		);
+	}
 }
-- 
2.20.1