From ba0fc4fa20067528effd4802e53ceeb959640825 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 12 Jan 2012 13:42:29 +0100
Subject: Update to MediaWiki 1.18.1

---
 tests/phpunit/includes/XmlTest.php                 |  4 +++
 tests/phpunit/includes/search/SearchUpdateTest.php | 10 ++++++++
 tests/phpunit/skins/SideBarTest.php                | 30 ++++++++++++++++++++++
 3 files changed, 44 insertions(+)

(limited to 'tests/phpunit')

diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index fbb498d8..a6058ef6 100644
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -138,6 +138,10 @@ class XmlTest extends MediaWikiTestCase {
 			Xml::dateMenu( ''      , $curMonth ),
 			"Date menu year is the current one when not specified"
 		);
+
+		$this->markTestIncomplete( "Broken" );
+		// @todo FIXME: next month can be in the next year
+		// test failing because it is now december
 		$this->assertEquals(
 			Xml::dateMenu( $prevYear, $nextMonth ),
 			Xml::dateMenu( '', $nextMonth ),
diff --git a/tests/phpunit/includes/search/SearchUpdateTest.php b/tests/phpunit/includes/search/SearchUpdateTest.php
index 935425a6..6e49a9a1 100644
--- a/tests/phpunit/includes/search/SearchUpdateTest.php
+++ b/tests/phpunit/includes/search/SearchUpdateTest.php
@@ -77,4 +77,14 @@ EOT
 			'Bug 18609'
 		);
 	}
+
+	function testBug32712() {
+		$text = "text „http://example.com“ text";
+		$result = $this->updateText( $text );
+		$processed = preg_replace( '/Q/u', 'Q', $result );
+		$this->assertTrue(
+			$processed != '',
+			'Link surrounded by unicode quotes should not fail UTF-8 validation'
+		);
+	}
 }
diff --git a/tests/phpunit/skins/SideBarTest.php b/tests/phpunit/skins/SideBarTest.php
index 47182a71..a9f56900 100644
--- a/tests/phpunit/skins/SideBarTest.php
+++ b/tests/phpunit/skins/SideBarTest.php
@@ -105,6 +105,36 @@ class SideBarTest extends MediaWikiLangTestCase {
 		);
 
 	}
+	/** bug 33321 */
+	function testTrickyPipe() {
+		$this->assertSidebar(
+		array( 'Title' => array(
+			# The first 2 are skipped
+			# Doesn't really test the url properly
+			# because it will vary with $wgArticlePath et al.
+			# ** Baz|Fred
+			array(
+				'text'   => 'Fred',
+				'href'   => Title::newFromText( 'Baz' )->getLocalUrl(),
+				'id'     => 'n-Fred',
+				'active' => null,
+			),
+			array(
+				'text'   => 'title-to-display',
+				'href'   => Title::newFromText( 'page-to-go-to' )->getLocalUrl(),
+				'id'     => 'n-title-to-display',
+				'active' => null,
+			),
+		)),
+'* Title
+** {{PAGENAME|Foo}}
+** Bar
+** Baz|Fred
+** {{PLURAL:1|page-to-go-to{{int:pipe-separator/en}}title-to-display|branch not taken}}
+'
+		);
+
+	}
 
 
 	#### Attributes for external links ##########################
-- 
cgit v1.2.3-54-g00ecf