6 files changed, 88 insertions, 1 deletions
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 4b4c7f72..0ce7c997 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -78,7 +78,7 @@ class ParserTest {
 	 */
 	public function __construct( $options = array() ) {
 		# Only colorize output if stdout is a terminal.
-		$this->color = !wfIsWindows() && posix_isatty( 1 );
+		$this->color = !wfIsWindows() && Maintenance::posix_isatty( 1 );
 
 		if ( isset( $options['color'] ) ) {
 			switch( $options['color'] ) {
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 ##########################
diff --git a/tests/qunit/index.html b/tests/qunit/index.html
index d4bbe7e2..f748b87f 100644
--- a/tests/qunit/index.html
+++ b/tests/qunit/index.html
@@ -43,6 +43,7 @@
 	<script src="../../resources/jquery/jquery.byteLength.js"></script>
 	<script src="../../resources/jquery/jquery.byteLimit.js"></script>
 	<script src="../../resources/jquery/jquery.colorUtil.js"></script>
+	<script src="../../resources/jquery/jquery.delayedBind.js"></script>
 	<script src="../../resources/jquery/jquery.getAttrs.js"></script>
 	<script src="../../resources/jquery/jquery.localize.js"></script>
 	<script src="../../resources/jquery/jquery.tabIndex.js"></script>
@@ -69,6 +70,7 @@
 	<script src="suites/resources/jquery/jquery.byteLength.js"></script>
 	<script src="suites/resources/jquery/jquery.byteLimit.js"></script>
 	<script src="suites/resources/jquery/jquery.colorUtil.js"></script>
+	<script src="suites/resources/jquery/jquery.delayedBind.test.js"></script>
 	<script src="suites/resources/jquery/jquery.getAttrs.js"></script>
 	<script src="suites/resources/jquery/jquery.localize.js"></script>
 	<script src="suites/resources/jquery/jquery.tabIndex.js"></script>
diff --git a/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js b/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js
new file mode 100644
index 00000000..8688f12e
--- /dev/null
+++ b/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js
@@ -0,0 +1,41 @@
+test('jquery.delayedBind with data option', function() {
+	var $fixture = $('<div>').appendTo('body'),
+		data = { magic: "beeswax" },
+		delay = 50;
+
+	$fixture.delayedBind(delay, 'testevent', data, function(event) {
+		start(); // continue!
+		ok(true, 'testevent fired');
+		ok(event.data === data, 'data is passed through delayedBind');
+	});
+
+	expect(2);
+	stop(); // async!
+
+	// We'll trigger it thrice, but it should only happen once.
+	$fixture.trigger('testevent', {});
+	$fixture.trigger('testevent', {});
+	$fixture.trigger('testevent', {});
+	$fixture.trigger('testevent', {});
+});
+
+test('jquery.delayedBind without data option', function() {
+	var $fixture = $('<div>').appendTo('body'),
+		data = { magic: "beeswax" },
+		delay = 50;
+
+	$fixture.delayedBind(delay, 'testevent', function(event) {
+		start(); // continue!
+		ok(true, 'testevent fired');
+	});
+
+	expect(1);
+	stop(); // async!
+
+	// We'll trigger it thrice, but it should only happen once.
+	$fixture.trigger('testevent', {});
+	$fixture.trigger('testevent', {});
+	$fixture.trigger('testevent', {});
+	$fixture.trigger('testevent', {});
+});
+