* 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

1 files changed, 6 insertions, 8 deletions

diff --git a/tests/phpunit/includes/TemplateCategoriesTest.php b/tests/phpunit/includes/TemplateCategoriesTest.php
index de9d6dc6dc85..416ec867b819 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;