From 5685904a111e4dfeb2ed9bc685a4fe161e177f76 Mon Sep 17 00:00:00 2001
From: Kosta Harlan <kharlan@wikimedia.org>
Date: Thu, 4 Oct 2018 09:52:41 -0400
Subject: [PATCH] Tests: Simplify badaccess group check for patrol action

The important part of the assertion is badaccess-groups, so we can drop the
other components and simplify the test code, plus also work around database
name issues that caused Travis CI to fail.

Bug: T206130
Change-Id: I137be892a611cd1f2d61baa77ad9528659587adf
---
 .../phpunit/includes/TitlePermissionTest.php  | 32 ++++++-------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php
index baf824352b..5aa24e597d 100644
--- a/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@ -454,8 +454,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	 * @covers Title::checkUserConfigPermissions
 	 */
 	public function testJsConfigEditPermissions() {
-		$prefix = MediaWikiServices::getInstance()->getContentLanguage()->
-			getFormattedNsText( NS_PROJECT );
 		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->userName . '/test.js' );
@@ -469,7 +467,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			[ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ] ],
-			[ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
+			[ [ 'badaccess-groups' ] ]
 		);
 	}
 
@@ -494,7 +492,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			[ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ],
-			[ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
+			[ [ 'badaccess-groups' ] ]
 		);
 	}
 
@@ -504,8 +502,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	 * @covers Title::checkUserConfigPermissions
 	 */
 	public function testCssConfigEditPermissions() {
-		$prefix = MediaWikiServices::getInstance()->getContentLanguage()->
-			getFormattedNsText( NS_PROJECT );
 		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->userName . '/test.css' );
@@ -519,7 +515,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ],
-			[ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
+			[ [ 'badaccess-groups' ] ]
 		);
 	}
 
@@ -529,8 +525,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	 * @covers Title::checkUserConfigPermissions
 	 */
 	public function testOtherJsConfigEditPermissions() {
-		$prefix = MediaWikiServices::getInstance()->getContentLanguage()->
-			getFormattedNsText( NS_PROJECT );
 		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->altUserName . '/test.js' );
@@ -544,7 +538,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			[ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ] ],
-			[ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
+			[ [ 'badaccess-groups' ] ]
 		);
 	}
 
@@ -554,8 +548,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	 * @covers Title::checkUserConfigPermissions
 	 */
 	public function testOtherJsonConfigEditPermissions() {
-		$prefix = MediaWikiServices::getInstance()->getContentLanguage()->
-			getFormattedNsText( NS_PROJECT );
 		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->altUserName . '/test.json' );
@@ -569,7 +561,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			[ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
-			[ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
+			[ [ 'badaccess-groups' ] ]
 		);
 	}
 
@@ -579,8 +571,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	 * @covers Title::checkUserConfigPermissions
 	 */
 	public function testOtherCssConfigEditPermissions() {
-		$prefix = MediaWikiServices::getInstance()->getContentLanguage()->
-			getFormattedNsText( NS_PROJECT );
 		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->altUserName . '/test.css' );
@@ -594,7 +584,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
-			[ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
+			[ [ 'badaccess-groups' ] ]
 		);
 	}
 
@@ -604,8 +594,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	 * @covers Title::checkUserConfigPermissions
 	 */
 	public function testOtherNonConfigEditPermissions() {
-		$prefix = MediaWikiServices::getInstance()->getContentLanguage()->
-			getFormattedNsText( NS_PROJECT );
 		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->altUserName . '/tempo' );
@@ -619,7 +607,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ] ],
-			[ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
+			[ [ 'badaccess-groups' ] ]
 		);
 	}
 
@@ -628,8 +616,6 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	 * @covers Title::checkUserConfigPermissions
 	 */
 	public function testPatrolActionConfigEditPermissions() {
-		$prefix = MediaWikiServices::getInstance()->getContentLanguage()->
-			getFormattedNsText( NS_PROJECT );
 		$this->setUser( 'anon' );
 		$this->setTitle( NS_USER, 'ToPatrolOrNotToPatrol' );
 		$this->runConfigEditPermissions(
@@ -642,7 +628,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ] ],
-			[ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
+			[ [ 'badaccess-groups' ] ]
 		);
 	}
 
@@ -686,7 +672,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 
 		$this->setUserPerm( '' );
 		$result = $this->title->getUserPermissionsErrors( 'patrol', $this->user );
-		$this->assertEquals( $resultPatrol, $result );
+		$this->assertEquals( reset( $resultPatrol[0] ), reset( $result[0] ) );
 
 		$this->setUserPerm( [ 'edituserjs', 'edituserjson', 'editusercss' ] );
 		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
-- 
2.20.1