X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fphpunit%2Fincludes%2FTitlePermissionTest.php;h=4e342447c4bd554452c692fc0fbd25f2400088fb;hb=9b670fb797813a8ed35750e2c83fe953a10f349e;hp=e20cc7b12fb2a5ef54268a4bc59571597a81a6d7;hpb=ca55cfd87d2efc41b6ab208d60d1cde61f0ac9c0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/TitlePermissionTest.php b/tests/phpunit/includes/TitlePermissionTest.php
index e20cc7b12f..4e342447c4 100644
--- a/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@ -96,6 +96,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	/**
 	 * @todo This test method should be split up into separate test methods and
 	 * data providers
+	 * @covers Title::checkQuickPermissions
 	 */
 	public function testQuickPermissions() {
 		global $wgContLang;
@@ -386,6 +387,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	/**
 	 * @todo This test method should be split up into separate test methods and
 	 * data providers
+	 * @covers Title::checkSpecialsAndNSPermissions
 	 */
 	public function testSpecialsAndNSPermissions() {
 		global $wgNamespaceProtection;
@@ -442,91 +444,203 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	/**
 	 * @todo This test method should be split up into separate test methods and
 	 * data providers
+	 * @covers Title::checkUserConfigPermissions
 	 */
-	public function testCssAndJavascriptPermissions() {
+	public function testJsConfigEditPermissions() {
 		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->userName . '/test.js' );
-		$this->runCSSandJSPermissions(
+		$this->runConfigEditPermissions(
+			[ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
+
 			[ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ] ],
+
+			[ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ] ]
 		);
+	}
+
+	/**
+	 * @todo This test method should be split up into separate test methods and
+	 * data providers
+	 * @covers Title::checkUserConfigPermissions
+	 */
+	public function testJsonConfigEditPermissions() {
+		$this->setUser( $this->userName );
+
+		$this->setTitle( NS_USER, $this->userName . '/test.json' );
+		$this->runConfigEditPermissions(
+			[ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ],
+
+			[ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ],
+			[ [ 'badaccess-group0' ] ],
+			[ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ],
+
+			[ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ],
+			[ [ 'badaccess-group0' ] ],
+			[ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ]
+		);
+	}
+
+	/**
+	 * @todo This test method should be split up into separate test methods and
+	 * data providers
+	 * @covers Title::checkUserConfigPermissions
+	 */
+	public function testCssConfigEditPermissions() {
+		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->userName . '/test.css' );
-		$this->runCSSandJSPermissions(
+		$this->runConfigEditPermissions(
 			[ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ],
+
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ],
+			[ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ],
+
 			[ [ 'badaccess-group0' ] ],
+			[ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ]
 		);
+	}
+
+	/**
+	 * @todo This test method should be split up into separate test methods and
+	 * data providers
+	 * @covers Title::checkUserConfigPermissions
+	 */
+	public function testOtherJsConfigEditPermissions() {
+		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->altUserName . '/test.js' );
-		$this->runCSSandJSPermissions(
+		$this->runConfigEditPermissions(
+			[ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
+
+			[ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
+
 			[ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ] ]
 		);
+	}
+
+	/**
+	 * @todo This test method should be split up into separate test methods and
+	 * data providers
+	 * @covers Title::checkUserConfigPermissions
+	 */
+	public function testOtherJsonConfigEditPermissions() {
+		$this->setUser( $this->userName );
+
+		$this->setTitle( NS_USER, $this->altUserName . '/test.json' );
+		$this->runConfigEditPermissions(
+			[ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
+
+			[ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
+			[ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
+			[ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
+
+			[ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
+			[ [ 'badaccess-group0' ] ],
+			[ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ]
+		);
+	}
+
+	/**
+	 * @todo This test method should be split up into separate test methods and
+	 * data providers
+	 * @covers Title::checkUserConfigPermissions
+	 */
+	public function testOtherCssConfigEditPermissions() {
+		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->altUserName . '/test.css' );
-		$this->runCSSandJSPermissions(
+		$this->runConfigEditPermissions(
+			[ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
+
 			[ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
+
 			[ [ 'badaccess-group0' ] ],
+			[ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
 			[ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ]
 		);
+	}
+
+	/**
+	 * @todo This test method should be split up into separate test methods and
+	 * data providers
+	 * @covers Title::checkUserConfigPermissions
+	 */
+	public function testOtherNonConfigEditPermissions() {
+		$this->setUser( $this->userName );
 
 		$this->setTitle( NS_USER, $this->altUserName . '/tempo' );
-		$this->runCSSandJSPermissions(
+		$this->runConfigEditPermissions(
+			[ [ 'badaccess-group0' ] ],
+
+			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ] ],
+
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ] ],
 			[ [ 'badaccess-group0' ] ]
 		);
 	}
 
-	protected function runCSSandJSPermissions( $result0, $result1, $result2, $result3, $result4 ) {
+	protected function runConfigEditPermissions(
+		$resultNone,
+		$resultMyCss,
+		$resultMyJson,
+		$resultMyJs,
+		$resultUserCss,
+		$resultUserJson,
+		$resultUserJs
+	) {
 		$this->setUserPerm( '' );
-		$this->assertEquals( $result0,
-			$this->title->getUserPermissionsErrors( 'bogus',
-				$this->user ) );
+		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
+		$this->assertEquals( $resultNone, $result );
 
 		$this->setUserPerm( 'editmyusercss' );
-		$this->assertEquals( $result1,
-			$this->title->getUserPermissionsErrors( 'bogus',
-				$this->user ) );
+		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
+		$this->assertEquals( $resultMyCss, $result );
+
+		$this->setUserPerm( 'editmyuserjson' );
+		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
+		$this->assertEquals( $resultMyJson, $result );
 
 		$this->setUserPerm( 'editmyuserjs' );
-		$this->assertEquals( $result2,
-			$this->title->getUserPermissionsErrors( 'bogus',
-				$this->user ) );
+		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
+		$this->assertEquals( $resultMyJs, $result );
 
 		$this->setUserPerm( 'editusercss' );
-		$this->assertEquals( $result3,
-			$this->title->getUserPermissionsErrors( 'bogus',
-				$this->user ) );
+		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
+		$this->assertEquals( $resultUserCss, $result );
+
+		$this->setUserPerm( 'edituserjson' );
+		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
+		$this->assertEquals( $resultUserJson, $result );
 
 		$this->setUserPerm( 'edituserjs' );
-		$this->assertEquals( $result4,
-			$this->title->getUserPermissionsErrors( 'bogus',
-				$this->user ) );
+		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
+		$this->assertEquals( $resultUserJs, $result );
 
-		$this->setUserPerm( [ 'edituserjs', 'editusercss' ] );
-		$this->assertEquals( [ [ 'badaccess-group0' ] ],
-			$this->title->getUserPermissionsErrors( 'bogus',
-				$this->user ) );
+		$this->setUserPerm( [ 'edituserjs', 'edituserjson', 'editusercss' ] );
+		$result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
+		$this->assertEquals( [ [ 'badaccess-group0' ] ], $result );
 	}
 
 	/**
 	 * @todo This test method should be split up into separate test methods and
 	 * data providers
+	 * @covers Title::checkPageRestrictions
 	 */
 	public function testPageRestrictions() {
 		global $wgContLang;
@@ -619,6 +733,9 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 				$this->user ) );
 	}
 
+	/**
+	 * @covers Title::checkCascadingSourcesRestrictions
+	 */
 	public function testCascadingSourcesRestrictions() {
 		$this->setTitle( NS_MAIN, "test page" );
 		$this->setUserPerm( [ "edit", "bogus" ] );
@@ -648,6 +765,7 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 	/**
 	 * @todo This test method should be split up into separate test methods and
 	 * data providers
+	 * @covers Title::checkActionPermissions
 	 */
 	public function testActionPermissions() {
 		$this->setUserPerm( [ "createpage" ] );
@@ -720,6 +838,9 @@ class TitlePermissionTest extends MediaWikiLangTestCase {
 			$this->title->userCan( 'move-target', $this->user ) );
 	}
 
+	/**
+	 * @covers Title::checkUserBlock
+	 */
 	public function testUserBlock() {
 		global $wgEmailConfirmToEdit, $wgEmailAuthentication;
 		$wgEmailConfirmToEdit = true;