X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FTitlePermissionTest.php;h=11b9c012f8f211b3187458456b3c859cf89251a2;hb=ac0ab2c03a12756b0965f250c174e228348ec459;hp=baf824352baa9f9de1020359695aa3077d5ae900;hpb=5ab949603164d51aee937f96c8111386490fd5ae;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php
index baf824352b..11b9c012f8 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 );
@@ -983,5 +969,22 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 				'Useruser', 'test', '23:00, 31 December 1969', '127.0.8.1',
 				$wgLang->timeanddate( wfTimestamp( TS_MW, $now ), true ) ] ],
 			$this->title->getUserPermissionsErrors( 'move-target', $this->user ) );
+
+		// partial block message test
+		$this->user->mBlockedby = $this->user->getName();
+		$this->user->mBlock = new Block( [
+			'address' => '127.0.8.1',
+			'by' => $this->user->getId(),
+			'reason' => 'no reason given',
+			'timestamp' => $now,
+			'sitewide' => false,
+			'expiry' => 10,
+		] );
+
+		$this->assertEquals( [ [ 'blockedtext-partial',
+				'[[User:Useruser|Useruser]]', 'no reason given', '127.0.0.1',
+				'Useruser', null, '23:00, 31 December 1969', '127.0.8.1',
+				$wgLang->timeanddate( wfTimestamp( TS_MW, $now ), true ) ] ],
+			$this->title->getUserPermissionsErrors( 'move-target', $this->user ) );
 	}
 }