X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FHtmlTest.php;h=5cc59b39781566f8c9f21bfab7b322066e2669cd;hb=7c091e68e9e9f8dcc5c09353671566f24719009b;hp=3c8fa25dafe533bd15f46b980b2064e16dd1efc8;hpb=925c20a9ca669c67cc44f4468d0e0f3b33b94213;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php
index 3c8fa25daf..5cc59b3978 100644
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -1,6 +1,7 @@
 <?php
 
 class HtmlTest extends MediaWikiTestCase {
+	private $restoreWarnings;
 
 	protected function setUp() {
 		parent::setUp();
@@ -36,6 +37,18 @@ class HtmlTest extends MediaWikiTestCase {
 		] );
 		$this->setUserLang( $langObj );
 		$this->setContentLang( $langObj );
+		$this->restoreWarnings = false;
+	}
+
+	protected function tearDown() {
+		Language::factory( 'en' )->resetNamespaces();
+
+		if ( $this->restoreWarnings ) {
+			$this->restoreWarnings = false;
+			Wikimedia\restoreWarnings();
+		}
+
+		parent::tearDown();
 	}
 
 	/**
@@ -476,6 +489,10 @@ class HtmlTest extends MediaWikiTestCase {
 			Html::errorBox( 'err', 'heading' ),
 			'<div class="errorbox"><h2>heading</h2>err</div>'
 		);
+		$this->assertEquals(
+			Html::errorBox( 'err', '0' ),
+			'<div class="errorbox"><h2>0</h2>err</div>'
+		);
 	}
 
 	/**
@@ -785,6 +802,58 @@ class HtmlTest extends MediaWikiTestCase {
 	public function testSrcSet( $images, $expected, $message ) {
 		$this->assertEquals( Html::srcSet( $images ), $expected, $message );
 	}
+
+	public static function provideInlineScript() {
+		return [
+			'Empty' => [
+				'',
+				'<script></script>'
+			],
+			'Simple' => [
+				'EXAMPLE.label("foo");',
+				'<script>EXAMPLE.label("foo");</script>'
+			],
+			'Ampersand' => [
+				'EXAMPLE.is(a && b);',
+				'<script>EXAMPLE.is(a && b);</script>'
+			],
+			'HTML' => [
+				'EXAMPLE.label("<a>");',
+				'<script>EXAMPLE.label("<a>");</script>'
+			],
+			'Script closing string (lower)' => [
+				'EXAMPLE.label("</script>");',
+				'<script>/* ERROR: Invalid script */</script>',
+				true,
+			],
+			'Script closing with non-standard attributes (mixed)' => [
+				'EXAMPLE.label("</SCriPT and STyLE>");',
+				'<script>/* ERROR: Invalid script */</script>',
+				true,
+			],
+			'HTML-comment-open and script-open' => [
+				// In HTML, <script> contents aren't just plain CDATA until </script>,
+				// there are levels of escaping modes, and the below sequence puts an
+				// HTML parser in a state where </script> would *not* close the script.
+				// https://html.spec.whatwg.org/multipage/parsing.html#script-data-double-escape-end-state
+				'var a = "<!--<script>";',
+				'<script>/* ERROR: Invalid script */</script>',
+				true,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider provideInlineScript
+	 * @covers Html::inlineScript
+	 */
+	public function testInlineScript( $code, $expected, $error = false ) {
+		if ( $error ) {
+			Wikimedia\suppressWarnings();
+			$this->restoreWarnings = true;
+		}
+		$this->assertSame( Html::inlineScript( $code ), $expected );
+	}
 }
 
 class HtmlTestValue {