X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiEditPageTest.php;h=4790f6b7271b8a52fbb92e693fc3baf351dfe313;hp=9486f881dbb261c758a1db4884a5150a815a631b;hb=767042c3e68adb29513;hpb=0b9edb467bbe687ff4e29088a4e5f008770a07a8

diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 9486f881db..4790f6b727 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -290,7 +290,7 @@ class ApiEditPageTest extends ApiTestCase {
 			'basetimestamp' => $baseTime,
 			'section' => 'new',
 			'redirect' => true,
-		], null, self::$users['sysop']->getUser() );
+		] );
 
 		$this->assertSame( 'Success', $re['edit']['result'],
 			"no problems expected when following redirect" );
@@ -336,7 +336,7 @@ class ApiEditPageTest extends ApiTestCase {
 				'text' => 'nix bar!',
 				'basetimestamp' => $baseTime,
 				'redirect' => true,
-			], null, self::$users['sysop']->getUser() );
+			] );
 
 			$this->fail( 'redirect-appendonly error expected' );
 		} catch ( ApiUsageException $ex ) {
@@ -372,7 +372,7 @@ class ApiEditPageTest extends ApiTestCase {
 				'title' => $name,
 				'text' => 'nix bar!',
 				'basetimestamp' => $baseTime,
-			], null, self::$users['sysop']->getUser() );
+			] );
 
 			$this->fail( 'edit conflict expected' );
 		} catch ( ApiUsageException $ex ) {
@@ -411,7 +411,7 @@ class ApiEditPageTest extends ApiTestCase {
 			'text' => 'nix bar!',
 			'basetimestamp' => $baseTime,
 			'section' => 'new',
-		], null, self::$users['sysop']->getUser() );
+		] );
 
 		$this->assertSame( 'Success', $re['edit']['result'],
 			"no edit conflict expected here" );
@@ -458,7 +458,7 @@ class ApiEditPageTest extends ApiTestCase {
 			'text' => 'nix bar!',
 			'section' => 'new',
 			'redirect' => true,
-		], null, self::$users['sysop']->getUser() );
+		] );
 
 		$this->assertSame( 'Success', $re['edit']['result'],
 			"no edit conflict expected here" );
@@ -529,6 +529,7 @@ class ApiEditPageTest extends ApiTestCase {
 		$name = 'Help:' . __FUNCTION__;
 		$uploader = self::$users['uploader']->getUser();
 		$sysop = self::$users['sysop']->getUser();
+
 		$apiResult = $this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
@@ -1528,21 +1529,14 @@ class ApiEditPageTest extends ApiTestCase {
 	public function testCreateImageRedirectAnon() {
 		$name = 'File:' . ucfirst( __FUNCTION__ );
 
-		// @todo When ApiTestCase supports anonymous users, this exception
-		// should no longer be thrown, and the test can then be updated to test
-		// for the actual expected behavior.
 		$this->setExpectedException( ApiUsageException::class,
-			'Invalid CSRF token.' );
-
-		$this->doApiRequestWithToken( [
-			'action' => 'logout',
-		] );
+			"Anonymous users can't create image redirects." );
 
 		$this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'text' => '#REDIRECT [[File:Other file.png]]',
-		] );
+		], null, new User() );
 	}
 
 	public function testCreateImageRedirectLoggedIn() {
@@ -1581,21 +1575,16 @@ class ApiEditPageTest extends ApiTestCase {
 	public function testProhibitedAnonymousEdit() {
 		$name = 'Help:' . ucfirst( __FUNCTION__ );
 
-		// @todo See comment in testCreateImageRedirectAnon
 		$this->setExpectedException( ApiUsageException::class,
-			'Invalid CSRF token.' );
-		$this->setMwGlobals( 'wgRevokePermissions',
-			[ '*' => [ 'edit' => true ] ] );
+			'The action you have requested is limited to users in the group: ' );
 
-		$this->doApiRequestWithToken( [
-			'action' => 'logout',
-		] );
+		$this->setMwGlobals( 'wgRevokePermissions', [ '*' => [ 'edit' => true ] ] );
 
 		$this->doApiRequestWithToken( [
 			'action' => 'edit',
 			'title' => $name,
 			'text' => 'Some text',
-		] );
+		], null, new User() );
 	}
 
 	public function testProhibitedChangeContentModel() {