Fixed sidebar tests on Windows. Can't use PHP_EOL here because \r\n is used only...

diff --git a/includes/Skin.php b/includes/Skin.php
index dfdb210..28a84f7 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1125,6 +1125,7 @@ abstract class Skin extends ContextSource {
                        if ( strpos( $line, '*' ) !== 0 ) {
                                continue;
                        }
+                       $line = rtrim( $line, "\r" ); // for Windows compat
 
                        if ( strpos( $line, '**' ) !== 0 ) {
                                $heading = trim( $line, '* ' );

diff --git a/tests/phpunit/skins/SideBarTest.php b/tests/phpunit/skins/SideBarTest.php
index 914ea3a..47182a7 100644 (file)
--- a/tests/phpunit/skins/SideBarTest.php
+++ b/tests/phpunit/skins/SideBarTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/**
+ * @group Skin
+ */
 class SideBarTest extends MediaWikiLangTestCase {
 
        /** A skin template, reinitialized before each test */