From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 22 Jun 2011 21:02:07 +0000 (+0000)
Subject: Readd r90538, this time with the missing global $wgHooks;
X-Git-Tag: 1.31.0-rc.0~29356
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=4a6f2369043fe8cb26d2fac5b8d0fbf58c53d1fb;p=lhc%2Fweb%2Fwiklou.git

Readd r90538, this time with the missing global $wgHooks;
---

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index a88c3572cf..64cb486b5d 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -231,5 +231,9 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		MediaWikiPHPUnitCommand::$additionalOptions[$offset] = $value;
 
 	}
+
+	public static function disableInterwikis( $prefix, &$data ) {
+		return false;
+	}
 }
 
diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php
index 2b920f5e00..753709c5da 100644
--- a/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@ -3,7 +3,7 @@
 /**
  * @group Database
  */
-class TitlePermissionTest extends MediaWikiTestCase {
+class TitlePermissionTest extends MediaWikiLangTestCase {
 	protected $title;
 	protected $user;
 	protected $anonUser;
@@ -14,6 +14,7 @@ class TitlePermissionTest extends MediaWikiTestCase {
 
 	function setUp() {
 		global $wgLocaltimezone, $wgLocalTZoffset, $wgMemc, $wgContLang, $wgLang;
+		parent::setUp();
 
 		if(!$wgMemc) {
 			$wgMemc = new EmptyBagOStuff;
@@ -50,6 +51,10 @@ class TitlePermissionTest extends MediaWikiTestCase {
 		}
 	}
 
+	function tearDown() {
+		parent::tearDown();
+	}
+
 	function setUserPerm( $perm ) {
 		if ( is_array( $perm ) ) {
 			$this->user->mRights = $perm;
diff --git a/tests/phpunit/includes/UploadTest.php b/tests/phpunit/includes/UploadTest.php
index da19c90dbf..17b3bc7618 100644
--- a/tests/phpunit/includes/UploadTest.php
+++ b/tests/phpunit/includes/UploadTest.php
@@ -7,10 +7,17 @@ class UploadTest extends MediaWikiTestCase {
 
 
 	function setUp() {
-		global $wgContLang;
+		global $wgHooks;
 		parent::setUp();
-		$wgContLang = Language::factory( 'en' );
+
 		$this->upload = new UploadTestHandler;
+		$this->hooks = $wgHooks;var_dump($wgHooks);
+		$wgHooks['InterwikiLoadPrefix'][] = 'MediaWikiTestCase::disableInterwikis';
+	}
+
+	function tearDown() {
+		global $wgHooks;
+		$wgHooks = $this->hooks;
 	}
 
 	/**