X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FHtmlTest.php;h=47217939bf39d87e1adbe8afe5ccdc9a1f71ebab;hb=5f1a4a3dfc049a742184d5690d211fb0321c9b9d;hp=6c92b8cb817bf92341c84243315f9a278cd8eae4;hpb=816e6ded007382f35df38ea8f4b5a32e8e256b78;p=lhc%2Fweb%2Fwiklou.git
diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php
index 6c92b8cb81..47217939bf 100644
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -7,7 +7,6 @@ class HtmlTest extends MediaWikiTestCase {
parent::setUp();
$this->setMwGlobals( [
- 'wgWellFormedXml' => false,
'wgUseMediaWikiUIEverywhere' => false,
] );
@@ -45,9 +44,9 @@ class HtmlTest extends MediaWikiTestCase {
*/
public function testElementBasics() {
$this->assertEquals(
- '![]()
',
+ '![]()
',
Html::element( 'img', null, '' ),
- 'No close tag for short-tag elements'
+ 'Self-closing tag for short-tag elements'
);
$this->assertEquals(
@@ -61,14 +60,6 @@ class HtmlTest extends MediaWikiTestCase {
Html::element( 'element', [], '' ),
'Close tag for empty element (array, string)'
);
-
- $this->setMwGlobals( 'wgWellFormedXml', true );
-
- $this->assertEquals(
- '![]()
',
- Html::element( 'img', null, '' ),
- 'Self-closing tag for short-tag elements (wgWellFormedXml = true)'
- );
}
public function dataXmlMimeType() {
@@ -134,23 +125,15 @@ class HtmlTest extends MediaWikiTestCase {
);
$this->assertEquals(
- ' selected',
+ ' selected=""',
Html::expandAttributes( [ 'selected' => true ] ),
'Boolean attributes have no value when value is true'
);
$this->assertEquals(
- ' selected',
+ ' selected=""',
Html::expandAttributes( [ 'selected' ] ),
'Boolean attributes have no value when value is true (passed as numerical array)'
);
-
- $this->setMwGlobals( 'wgWellFormedXml', true );
-
- $this->assertEquals(
- ' selected=""',
- Html::expandAttributes( [ 'selected' => true ] ),
- 'Boolean attributes have empty string value when value is true (wgWellFormedXml)'
- );
}
/**
@@ -158,12 +141,12 @@ class HtmlTest extends MediaWikiTestCase {
*/
public function testExpandAttributesForNumbers() {
$this->assertEquals(
- ' value=1',
+ ' value="1"',
Html::expandAttributes( [ 'value' => 1 ] ),
'Integer value is cast to a string'
);
$this->assertEquals(
- ' value=1.1',
+ ' value="1.1"',
Html::expandAttributes( [ 'value' => 1.1 ] ),
'Float value is cast to a string'
);
@@ -174,7 +157,7 @@ class HtmlTest extends MediaWikiTestCase {
*/
public function testExpandAttributesForObjects() {
$this->assertEquals(
- ' value=stringValue',
+ ' value="stringValue"',
Html::expandAttributes( [ 'value' => new HtmlTestValue() ] ),
'Object value is converted to a string'
);
@@ -193,43 +176,21 @@ class HtmlTest extends MediaWikiTestCase {
'Empty string is always quoted'
);
$this->assertEquals(
- ' key=value',
+ ' key="value"',
Html::expandAttributes( [ 'key' => 'value' ] ),
'Simple string value needs no quotes'
);
$this->assertEquals(
- ' one=1',
+ ' one="1"',
Html::expandAttributes( [ 'one' => 1 ] ),
'Number 1 value needs no quotes'
);
$this->assertEquals(
- ' zero=0',
+ ' zero="0"',
Html::expandAttributes( [ 'zero' => 0 ] ),
'Number 0 value needs no quotes'
);
- $this->setMwGlobals( 'wgWellFormedXml', true );
-
- $this->assertEquals(
- ' empty_string=""',
- Html::expandAttributes( [ 'empty_string' => '' ] ),
- 'Attribute values are always quoted (wgWellFormedXml): Empty string'
- );
- $this->assertEquals(
- ' key="value"',
- Html::expandAttributes( [ 'key' => 'value' ] ),
- 'Attribute values are always quoted (wgWellFormedXml): Simple string'
- );
- $this->assertEquals(
- ' one="1"',
- Html::expandAttributes( [ 'one' => 1 ] ),
- 'Attribute values are always quoted (wgWellFormedXml): Number 1'
- );
- $this->assertEquals(
- ' zero="0"',
- Html::expandAttributes( [ 'zero' => 0 ] ),
- 'Attribute values are always quoted (wgWellFormedXml): Number 0'
- );
}
/**
@@ -346,48 +307,48 @@ class HtmlTest extends MediaWikiTestCase {
*/
public function testNamespaceSelector() {
$this->assertEquals(
- '