Followup r99305 - change tests to match behaviour. Would set globals but restoring...

diff --git a/tests/phpunit/includes/XmlSelectTest.php b/tests/phpunit/includes/XmlSelectTest.php
index bf761e3..2407c15 100644 (file)
--- 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 fbb498d..b55cb91 100644 (file)
--- 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" .