Merge "Revert "Setting up a way to have uploading by URL, but not on Special:Upload""

[lhc/web/wiklou.git] / tests / phpunit / includes / XmlSelectTest.php

diff --git a/tests/phpunit/includes/XmlSelectTest.php b/tests/phpunit/includes/XmlSelectTest.php
index 96a3b2a..2407c15 100644 (file)
--- a/tests/phpunit/includes/XmlSelectTest.php
+++ b/tests/phpunit/includes/XmlSelectTest.php
@@ -79,9 +79,9 @@ class XmlSelectTest extends MediaWikiTestCase {
                $this->select->addOption( 'bar1' );
                $this->select->addOption( 'foo2' );
                $this->assertEquals(
-'<select><option value="foo1">foo1</option>
-<option value="bar1" selected="selected">bar1</option>
-<option value="foo2">foo2</option></select>', $this->select->getHTML() );
+'<select><option value="foo1">foo1</option>' . "\n" .
+'<option value="bar1" selected="">bar1</option>' . "\n" .
+'<option value="foo2">foo2</option></select>', $this->select->getHTML() );
        }
 
        /**
@@ -90,16 +90,14 @@ class XmlSelectTest extends MediaWikiTestCase {
         * To handle this, we need to render the options in getHtml()
         */
        public function testSetDefaultAfterAddingOptions() {
-               $this->markTestSkipped( 'XmlSelect::setDefault() need to apply to previously added options');
-
                $this->select->addOption( 'foo1' );
                $this->select->addOption( 'bar1' );
                $this->select->addOption( 'foo2' );
                $this->select->setDefault( 'bar1' ); # setting default after adding options
                $this->assertEquals(
-'<select><option value="foo1">foo1</option>
-<option value="bar1" selected="selected">bar1</option>
-<option value="foo2">foo2</option></select>', $this->select->getHTML() );
+'<select><option value="foo1">foo1</option>' . "\n" .
+'<option value="bar1" selected="">bar1</option>' . "\n" .
+'<option value="foo2">foo2</option></select>', $this->select->getHTML() );
        }
 
        public function testGetAttributes() {