From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 1 Feb 2012 15:53:57 +0000 (+0000)
Subject: * Use WikiPage instead of Article
X-Git-Tag: 1.31.0-rc.0~24977
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=97349af6677b7b2c8d991ec3d49cbf1d34e4f417;p=lhc%2Fweb%2Fwiklou.git

* Use WikiPage instead of Article
* Use a local User object passed to WikiPage::doEdit() instead of overriding $wgUser
---

diff --git a/tests/phpunit/includes/ArticleTablesTest.php b/tests/phpunit/includes/ArticleTablesTest.php
index 28d67087b4..02571b55c9 100644
--- a/tests/phpunit/includes/ArticleTablesTest.php
+++ b/tests/phpunit/includes/ArticleTablesTest.php
@@ -6,26 +6,25 @@
 class ArticleTablesTest extends MediaWikiLangTestCase {
 
 	function testbug14404() {
-		global $wgUser, $wgContLang, $wgLanguageCode, $wgLang;
+		global $wgContLang, $wgLanguageCode, $wgLang;
 
-		$title = Title::newFromText("Bug 14404");
-		$article = new Article( $title );
-		$wgUser = new User();
-		$wgUser->mRights = array( 'createpage', 'edit', 'purge' );
+		$title = Title::newFromText( 'Bug 14404' );
+		$page = WikiPage::factory( $title );
+		$user = new User();
+		$user->mRights = array( 'createpage', 'edit', 'purge' );
 		$wgLanguageCode = 'es';
 		$wgContLang = Language::factory( 'es' );
 
 		$wgLang = Language::factory( 'fr' );
-		$status = $article->doEdit( '{{:{{int:history}}}}', 'Test code for bug 14404', 0 );
-		$templates1 = $article->getUsedTemplates();
+		$status = $page->doEdit( '{{:{{int:history}}}}', 'Test code for bug 14404', 0, false, $user );
+		$templates1 = $page->getUsedTemplates();
 
 		$wgLang = Language::factory( 'de' );
-		$article->mParserOptions = null; // Let it pick the new user language
-		$article->mPreparedEdit = false; // In order to force the rerendering of the same wikitext
+		$page->mPreparedEdit = false; // In order to force the rerendering of the same wikitext
 
 		// We need an edit, a purge is not enough to regenerate the tables
-		$status = $article->doEdit( '{{:{{int:history}}}}', 'Test code for bug 14404', EDIT_UPDATE );
-		$templates2 = $article->getUsedTemplates();
+		$status = $page->doEdit( '{{:{{int:history}}}}', 'Test code for bug 14404', EDIT_UPDATE, false, $user );
+		$templates2 = $page->getUsedTemplates();
 
 		$this->assertEquals( $templates1, $templates2 );
 		$this->assertEquals( $templates1[0]->getFullText(), 'Historial' );