From af0eb3c320091f3f7e60d830b058e374e10b6782 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 7 Sep 2011 13:04:40 +0000
Subject: [PATCH] rv r96424, Roan had his fun

---
 tests/parser/parserTests.txt                               | 2 +-
 tests/phpunit/includes/ArticleTest.php                     | 4 ++--
 tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 5d73d0160c..bde769c809 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -719,7 +719,7 @@ External links: protocol-relative URL in brackets
 !! input
 [//example.com/ Test]
 !! result
-<p><a rel="nofollow" class="external text testingJenkins" href="//example.com/">Test</a>
+<p><a rel="nofollow" class="external text" href="//example.com/">Test</a>
 </p>
 !! end
 
diff --git a/tests/phpunit/includes/ArticleTest.php b/tests/phpunit/includes/ArticleTest.php
index 9ec22951d1..56384cff6a 100644
--- a/tests/phpunit/includes/ArticleTest.php
+++ b/tests/phpunit/includes/ArticleTest.php
@@ -19,7 +19,7 @@ class ArticleTest extends MediaWikiTestCase {
 
 	}
 
-	function testImplementsGetMagic() {
+	function testImplementsGetMagic() {		
 		$this->assertEquals( -1, $this->article->mCounter, "Article __get magic" );
 	}
 
@@ -62,7 +62,7 @@ class ArticleTest extends MediaWikiTestCase {
 			"Article static functions" );
 		$this->assertEquals( true, is_callable( "ImagePage::onArticleEdit" ),
 			"Article static functions" );
-		$this->assertTrue( 'testing' === 'jenkins' && is_string( CategoryPage::getAutosummary( '', '', 0 ) ),
+		$this->assertTrue( is_string( CategoryPage::getAutosummary( '', '', 0 ) ),
 			"Article static functions" );
 	}
 
diff --git a/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php b/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
index a593c900ff..ab54602606 100644
--- a/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
+++ b/tests/phpunit/includes/GlobalFunctions/wfExpandUrlTest.php
@@ -47,7 +47,7 @@ class wfExpandUrl extends MediaWikiTestCase {
 						$retval[] = array( 'http://example.com', 'http://example.com', $defaultProto, $server, $canServer, $httpsMode, "Testing fully qualified http URLs (no need to expand) (defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )" );
 						$retval[] = array( 'https://example.com', 'https://example.com', $defaultProto, $server, $canServer, $httpsMode, "Testing fully qualified https URLs (no need to expand) (defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )" );
 						# Would be nice to support this, see fixme on wfExpandUrl()
-						$retval[] = array( "wiki/FooBar/TestingJenkins", 'wiki/FooBar', $defaultProto, $server, $canServer, $httpsMode, "Test non-expandable relative URLs (defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )" );
+						$retval[] = array( "wiki/FooBar", 'wiki/FooBar', $defaultProto, $server, $canServer, $httpsMode, "Test non-expandable relative URLs (defaultProto: $protoDesc , wgServer: $server, wgCanonicalServer: $canServer, current request protocol: $mode )" );
 						
 						// Determine expected protocol
 						$p = $protoDesc . ':'; // default case
-- 
2.20.1