From 079b17112a24305d2fc418cbb2eb1e7ec498929f Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 3 Oct 2010 23:03:57 +0000
Subject: [PATCH] Fixup testGetToken again

Iterate through both users, checking for rights to delete/block/protect
---
 .../phpunit/includes/api/ApiWatchTest.php     | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
index aced623e59..689b7050e3 100644
--- a/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
+++ b/maintenance/tests/phpunit/includes/api/ApiWatchTest.php
@@ -32,25 +32,41 @@ class ApiWatchTest extends ApiTestSetup {
 	}
 
 	function testGetToken() {
+		foreach ( array( self::$user, self::$sysopUser ) as $user ) {
+			$GLOBALS['wgUser'] = $user->user;
 
-		$data = $this->doApiRequest( array(
-			'action' => 'query',
-			'titles' => 'Main Page',
-			'intoken' => 'edit|delete|protect|move|block|unblock',
-			'prop' => 'info' ) );
+			$data = $this->doApiRequest( array(
+				'action' => 'query',
+				'titles' => 'Main Page',
+				'intoken' => 'edit|delete|protect|move|block|unblock',
+				'prop' => 'info' ) );
 
-		$this->assertArrayHasKey( 'query', $data[0] );
-		$this->assertArrayHasKey( 'pages', $data[0]['query'] );
-		$keys = array_keys( $data[0]['query']['pages'] );
-		$key = array_pop( $keys );
+			$this->assertArrayHasKey( 'query', $data[0] );
+			$this->assertArrayHasKey( 'pages', $data[0]['query'] );
+			$keys = array_keys( $data[0]['query']['pages'] );
+			$key = array_pop( $keys );
+
+			$rights = $user->user->getRights();
+
+			$this->assertArrayHasKey( $key, $data[0]['query']['pages'] );
+			$this->assertArrayHasKey( 'edittoken', $data[0]['query']['pages'][$key] );
+			$this->assertArrayHasKey( 'movetoken', $data[0]['query']['pages'][$key] );
+
+			if ( isset( $rights['delete'] ) ) {
+				$this->assertArrayHasKey( 'deletetoken', $data[0]['query']['pages'][$key] );
+			}
+
+			if ( isset( $rights['block'] ) ) {
+				$this->assertArrayHasKey( 'blocktoken', $data[0]['query']['pages'][$key] );
+				$this->assertArrayHasKey( 'unblocktoken', $data[0]['query']['pages'][$key] );
+			}
+
+			if ( isset( $rights['protect'] ) ) {
+				$this->assertArrayHasKey( 'protecttoken', $data[0]['query']['pages'][$key] );
+			}
+		}
 
-		$this->assertArrayHasKey( $key, $data[0]['query']['pages'] );
-		$this->assertArrayHasKey( 'edittoken', $data[0]['query']['pages'][$key] );
-		$this->assertArrayHasKey( 'movetoken', $data[0]['query']['pages'][$key] );
-		$this->assertArrayHasKey( 'deletetoken', $data[0]['query']['pages'][$key] );
-		$this->assertArrayHasKey( 'blocktoken', $data[0]['query']['pages'][$key] );
-		$this->assertArrayHasKey( 'unblocktoken', $data[0]['query']['pages'][$key] );
-		$this->assertArrayHasKey( 'protecttoken', $data[0]['query']['pages'][$key] );
+	    $GLOBALS['wgUser'] = self::$user->user;
 	}
 
 	/**
-- 
2.20.1