From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sat, 8 Oct 2011 11:58:01 +0000 (+0000)
Subject: Followup r99305 - change tests to match behaviour. Would set globals but restoring... 
X-Git-Tag: 1.31.0-rc.0~27191
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=48714a4968f15d0e94faffa915cb5692ac3c087a;p=lhc%2Fweb%2Fwiklou.git

Followup r99305 - change tests to match behaviour. Would set globals but restoring them manually is just too laborious
---

diff --git a/tests/phpunit/includes/XmlSelectTest.php b/tests/phpunit/includes/XmlSelectTest.php
index bf761e3d3a..2407c15171 100644
--- a/tests/phpunit/includes/XmlSelectTest.php
+++ b/tests/phpunit/includes/XmlSelectTest.php
@@ -80,7 +80,7 @@ class XmlSelectTest extends MediaWikiTestCase {
 		$this->select->addOption( 'foo2' );
 		$this->assertEquals(
 '<select><option value="foo1">foo1</option>' . "\n" .
-'<option value="bar1" selected="selected">bar1</option>' . "\n" .
+'<option value="bar1" selected="">bar1</option>' . "\n" .
 '<option value="foo2">foo2</option></select>', $this->select->getHTML() );
 	}
 
@@ -96,7 +96,7 @@ class XmlSelectTest extends MediaWikiTestCase {
 		$this->select->setDefault( 'bar1' ); # setting default after adding options
 		$this->assertEquals(
 '<select><option value="foo1">foo1</option>' . "\n" .
-'<option value="bar1" selected="selected">bar1</option>' . "\n" .
+'<option value="bar1" selected="">bar1</option>' . "\n" .
 '<option value="foo2">foo2</option></select>', $this->select->getHTML() );
 	}
 
diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index fbb498d84c..b55cb91ee7 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -102,7 +102,7 @@ class XmlTest extends MediaWikiTestCase {
 		$this->assertEquals(
 			'<label for="year">From year (and earlier):</label> <input name="year" size="4" value="2011" id="year" maxlength="4" /> <label for="month">From month (and earlier):</label> <select id="month" name="month" class="mw-month-selector"><option value="-1">all</option>' . "\n" .
 '<option value="1">January</option>' . "\n" .
-'<option value="2" selected="selected">February</option>' . "\n" .
+'<option value="2" selected="">February</option>' . "\n" .
 '<option value="3">March</option>' . "\n" .
 '<option value="4">April</option>' . "\n" .
 '<option value="5">May</option>' . "\n" .