X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FHtmlTest.php;h=5410644a4929e1998aa30b8661d7202010a985bc;hb=434015880aab5b155cc7edd6fcddf1883d0395eb;hp=070a02936fdbe7985e9f0eed0cf712694790a26a;hpb=a97139808acf244936a870fe8bf7ba3667795f3b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php
index 070a02936f..5d83b7eb5b 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();
@@ -9,12 +10,12 @@ class HtmlTest extends MediaWikiTestCase {
 			'wgUseMediaWikiUIEverywhere' => false,
 		] );
 
-		$langObj = Language::factory( 'en' );
+		$contLangObj = Language::factory( 'en' );
 
 		// Hardcode namespaces during test runs,
 		// so that html output based on existing namespaces
 		// can be properly evaluated.
-		$langObj->setNamespaces( [
+		$contLangObj->setNamespaces( [
 			-2 => 'Media',
 			-1 => 'Special',
 			0 => '',
@@ -34,8 +35,54 @@ class HtmlTest extends MediaWikiTestCase {
 			100 => 'Custom',
 			101 => 'Custom_talk',
 		] );
-		$this->setUserLang( $langObj );
-		$this->setContentLang( $langObj );
+		$this->setContentLang( $contLangObj );
+
+		$userLangObj = Language::factory( 'es' );
+		$userLangObj->setNamespaces( [
+			-2 => "Medio",
+			-1 => "Especial",
+			0 => "",
+			1 => "Discusión",
+			2 => "Usuario",
+			3 => "Usuario discusión",
+			4 => "Wiki",
+			5 => "Wiki discusión",
+			6 => "Archivo",
+			7 => "Archivo discusión",
+			8 => "MediaWiki",
+			9 => "MediaWiki discusión",
+			10 => "Plantilla",
+			11 => "Plantilla discusión",
+			12 => "Ayuda",
+			13 => "Ayuda discusión",
+			14 => "Categoría",
+			15 => "Categoría discusión",
+			100 => "Personalizado",
+			101 => "Personalizado discusión",
+		] );
+		$this->setUserLang( $userLangObj );
+
+		$this->restoreWarnings = false;
+	}
+
+	protected function tearDown() {
+		Language::factory( 'en' )->resetNamespaces();
+
+		if ( $this->restoreWarnings ) {
+			$this->restoreWarnings = false;
+			Wikimedia\restoreWarnings();
+		}
+
+		parent::tearDown();
+	}
+
+	/**
+	 * @expectedException PHPUnit_Framework_Error_Notice
+	 * @expectedExceptionMessage given element name with space
+	 * @covers Html::openElement
+	 */
+	public function testOpenElement() {
+		Html::openElement( 'span id="x"' );
 	}
 
 	/**
@@ -165,7 +212,6 @@ class HtmlTest extends MediaWikiTestCase {
 	}
 
 	/**
-	 * Test for Html::expandAttributes()
 	 * Please note it output a string prefixed with a space!
 	 * @covers Html::expandAttributes
 	 */
@@ -270,7 +316,7 @@ class HtmlTest extends MediaWikiTestCase {
 
 	/**
 	 * How do we handle duplicate keys in HTML attributes expansion?
-	 * We could pass a "class" the values: 'GREEN' and array( 'GREEN' => false )
+	 * We could pass a "class" the values: 'GREEN' and [ 'GREEN' => false ]
 	 * The latter will take precedence.
 	 *
 	 * Feature added by r96188
@@ -309,7 +355,7 @@ class HtmlTest extends MediaWikiTestCase {
 	public function testNamespaceSelector() {
 		$this->assertEquals(
 			'<select id="namespace" name="namespace">' . "\n" .
-				'<option value="0">(Main)</option>' . "\n" .
+				'<option value="0">(Principal)</option>' . "\n" .
 				'<option value="1">Talk</option>' . "\n" .
 				'<option value="2">User</option>' . "\n" .
 				'<option value="3">User talk</option>' . "\n" .
@@ -333,8 +379,8 @@ class HtmlTest extends MediaWikiTestCase {
 		$this->assertEquals(
 			'<label for="mw-test-namespace">Select a namespace:</label>' . "\u{00A0}" .
 				'<select id="mw-test-namespace" name="wpNamespace">' . "\n" .
-				'<option value="all">all</option>' . "\n" .
-				'<option value="0">(Main)</option>' . "\n" .
+				'<option value="all">todos</option>' . "\n" .
+				'<option value="0">(Principal)</option>' . "\n" .
 				'<option value="1">Talk</option>' . "\n" .
 				'<option value="2" selected="">User</option>' . "\n" .
 				'<option value="3">User talk</option>' . "\n" .
@@ -361,7 +407,7 @@ class HtmlTest extends MediaWikiTestCase {
 		$this->assertEquals(
 			'<label for="namespace">Select a namespace:</label>' . "\u{00A0}" .
 				'<select id="namespace" name="namespace">' . "\n" .
-				'<option value="0">(Main)</option>' . "\n" .
+				'<option value="0">(Principal)</option>' . "\n" .
 				'<option value="1">Talk</option>' . "\n" .
 				'<option value="2">User</option>' . "\n" .
 				'<option value="3">User talk</option>' . "\n" .
@@ -383,6 +429,33 @@ class HtmlTest extends MediaWikiTestCase {
 			),
 			'Basic namespace selector with a custom label but no id attribtue for the <select>'
 		);
+
+		$this->assertEquals(
+			'<select id="namespace" name="namespace">' . "\n" .
+				'<option value="0">(Principal)</option>' . "\n" .
+				'<option value="1">Discusión</option>' . "\n" .
+				'<option value="2">Usuario</option>' . "\n" .
+				'<option value="3">Usuario discusión</option>' . "\n" .
+				'<option value="4">Wiki</option>' . "\n" .
+				'<option value="5">Wiki discusión</option>' . "\n" .
+				'<option value="6">Archivo</option>' . "\n" .
+				'<option value="7">Archivo discusión</option>' . "\n" .
+				'<option value="8">MediaWiki</option>' . "\n" .
+				'<option value="9">MediaWiki discusión</option>' . "\n" .
+				'<option value="10">Plantilla</option>' . "\n" .
+				'<option value="11">Plantilla discusión</option>' . "\n" .
+				'<option value="12">Ayuda</option>' . "\n" .
+				'<option value="13">Ayuda discusión</option>' . "\n" .
+				'<option value="14">Categoría</option>' . "\n" .
+				'<option value="15">Categoría discusión</option>' . "\n" .
+				'<option value="100">Personalizado</option>' . "\n" .
+				'<option value="101">Personalizado discusión</option>' . "\n" .
+				'</select>',
+			Html::namespaceSelector(
+				[ 'in-user-lang' => true ]
+			),
+			'Basic namespace selector in user language'
+		);
 	}
 
 	/**
@@ -408,6 +481,26 @@ class HtmlTest extends MediaWikiTestCase {
 			),
 			'Namespace selector namespace filtering.'
 		);
+		$this->assertEquals(
+			'<select id="namespace" name="namespace">' . "\n" .
+				'<option value="" selected="">todos</option>' . "\n" .
+				'<option value="2">User</option>' . "\n" .
+				'<option value="4">MyWiki</option>' . "\n" .
+				'<option value="5">MyWiki Talk</option>' . "\n" .
+				'<option value="6">File</option>' . "\n" .
+				'<option value="7">File talk</option>' . "\n" .
+				'<option value="8">MediaWiki</option>' . "\n" .
+				'<option value="9">MediaWiki talk</option>' . "\n" .
+				'<option value="10">Template</option>' . "\n" .
+				'<option value="11">Template talk</option>' . "\n" .
+				'<option value="14">Category</option>' . "\n" .
+				'<option value="15">Category talk</option>' . "\n" .
+				'</select>',
+			Html::namespaceSelector(
+				[ 'exclude' => [ 0, 1, 3, 100, 101 ], 'all' => '' ]
+			),
+			'Namespace selector namespace filtering with empty custom "all" option.'
+		);
 	}
 
 	/**
@@ -416,7 +509,7 @@ class HtmlTest extends MediaWikiTestCase {
 	public function testCanDisableANamespaces() {
 		$this->assertEquals(
 			'<select id="namespace" name="namespace">' . "\n" .
-				'<option disabled="" value="0">(Main)</option>' . "\n" .
+				'<option disabled="" value="0">(Principal)</option>' . "\n" .
 				'<option disabled="" value="1">Talk</option>' . "\n" .
 				'<option disabled="" value="2">User</option>' . "\n" .
 				'<option disabled="" value="3">User talk</option>' . "\n" .
@@ -802,21 +895,30 @@ class HtmlTest extends MediaWikiTestCase {
 			],
 			'Ampersand' => [
 				'EXAMPLE.is(a && b);',
-				'<script>/*<![CDATA[*/EXAMPLE.is(a && b);/*]]>*/</script>'
+				'<script>EXAMPLE.is(a && b);</script>'
 			],
 			'HTML' => [
 				'EXAMPLE.label("<a>");',
-				'<script>/*<![CDATA[*/EXAMPLE.label("<a>");/*]]>*/</script>'
+				'<script>EXAMPLE.label("<a>");</script>'
 			],
-			'Script closing string' => [
+			'Script closing string (lower)' => [
 				'EXAMPLE.label("</script>");',
-				// Broken: First </script> ends the script in HTML
-				'<script>/*<![CDATA[*/EXAMPLE.label("</script>");/*]]>*/</script>'
+				'<script>/* ERROR: Invalid script */</script>',
+				true,
 			],
-			'CDATA string' => [
-				'EXAMPLE.label("&> CDATA ]]>");',
-				// Broken: Works in HTML, but is invalid XML.
-				'<script>/*<![CDATA[*/EXAMPLE.label("&> CDATA ]]>");/*]]>*/</script>'
+			'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,
 			],
 		];
 	}
@@ -825,7 +927,11 @@ class HtmlTest extends MediaWikiTestCase {
 	 * @dataProvider provideInlineScript
 	 * @covers Html::inlineScript
 	 */
-	public function testInlineScript( $code, $expected ) {
+	public function testInlineScript( $code, $expected, $error = false ) {
+		if ( $error ) {
+			Wikimedia\suppressWarnings();
+			$this->restoreWarnings = true;
+		}
 		$this->assertSame( Html::inlineScript( $code ), $expected );
 	}
 }