From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sun, 12 Feb 2012 15:22:01 +0000 (+0000)
Subject: * Use WikiPage instead of Article to call doEdit()
X-Git-Tag: 1.31.0-rc.0~24758
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=2aecd77a15d2411973b4338e152243d1e95bc268;p=lhc%2Fweb%2Fwiklou.git

* Use WikiPage instead of Article to call doEdit()
* Use a local user object and pass it WikiPage::doEdit()
* User::$mRights is a flat array of permissions, not a 2-D array like $wgGroupPermissions
---

diff --git a/tests/phpunit/includes/TemplateCategoriesTest.php b/tests/phpunit/includes/TemplateCategoriesTest.php
index de9d6dc6dc..416ec867b8 100644
--- a/tests/phpunit/includes/TemplateCategoriesTest.php
+++ b/tests/phpunit/includes/TemplateCategoriesTest.php
@@ -8,21 +8,19 @@ require dirname( __FILE__ ) . "/../../../maintenance/runJobs.php";
 class TemplateCategoriesTest extends MediaWikiLangTestCase {
 
 	function testTemplateCategories() {
-		global $wgUser;
-
 		$title = Title::newFromText( "Categorized from template" );
-		$article = new Article( $title );
-		$wgUser = new User();
-		$wgUser->mRights['*'] = array( 'createpage', 'edit', 'purge' );
+		$page = WikiPage::factory( $title );
+		$user = new User();
+		$user->mRights = array( 'createpage', 'edit', 'purge' );
 
-		$status = $article->doEdit( '{{Categorising template}}', 'Create a page with a template', 0 );
+		$status = $page->doEdit( '{{Categorising template}}', 'Create a page with a template', 0, false, $user );
 		$this->assertEquals(
 			array()
 			, $title->getParentCategories()
 		);
 
-		$template = new Article( Title::newFromText( 'Template:Categorising template' ) );
-		$status = $template->doEdit( '[[Category:Solved bugs]]', 'Add a category through a template', 0 );
+		$template = WikiPage::factory( Title::newFromText( 'Template:Categorising template' ) );
+		$status = $template->doEdit( '[[Category:Solved bugs]]', 'Add a category through a template', 0, false, $user );
 
 		// Run the job queue
 		$jobs = new RunJobs;