Merge "Revert "Re-enable tests from TitlePermissionTest""

diff --combined tests/phpunit/includes/TitlePermissionTest.php
index df125e1,dd84b7e..baf8243
--- 1/tests/phpunit/includes/TitlePermissionTest.php
--- 2/tests/phpunit/includes/TitlePermissionTest.php
+++ b/tests/phpunit/includes/TitlePermissionTest.php
@@@ -99,6 -99,10 +99,10 @@@ class TitlePermissionTest extends Media
        /**
         * @todo This test method should be split up into separate test methods and
         * data providers
+        *
+        * This test is failing per T201776.
+        *
+        * @group Broken
         * @covers Title::checkQuickPermissions
         */
        public function testQuickPermissions() {
@@@ -450,8 -454,6 +454,8 @@@
         * @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' );
@@@ -464,8 -466,7 +468,8 @@@
  
                        [ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
                        [ [ 'badaccess-group0' ], [ 'mycustomjsprotected', 'bogus' ] ],
 -                      [ [ 'badaccess-group0' ] ]
 +                      [ [ 'badaccess-group0' ] ],
 +                      [ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
                );
        }
  
@@@ -475,8 -476,6 +479,8 @@@
         * @covers Title::checkUserConfigPermissions
         */
        public function testJsonConfigEditPermissions() {
 +              $prefix = MediaWikiServices::getInstance()->getContentLanguage()->
 +                      getFormattedNsText( NS_PROJECT );
                $this->setUser( $this->userName );
  
                $this->setTitle( NS_USER, $this->userName . '/test.json' );
@@@ -489,8 -488,7 +493,8 @@@
  
                        [ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ],
                        [ [ 'badaccess-group0' ] ],
 -                      [ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ]
 +                      [ [ 'badaccess-group0' ], [ 'mycustomjsonprotected', 'bogus' ] ],
 +                      [ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
                );
        }
  
@@@ -500,8 -498,6 +504,8 @@@
         * @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' );
@@@ -514,8 -510,7 +518,8 @@@
  
                        [ [ 'badaccess-group0' ] ],
                        [ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ],
 -                      [ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ]
 +                      [ [ 'badaccess-group0' ], [ 'mycustomcssprotected', 'bogus' ] ],
 +                      [ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
                );
        }
  
@@@ -525,8 -520,6 +529,8 @@@
         * @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' );
@@@ -539,8 -532,7 +543,8 @@@
  
                        [ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
                        [ [ 'badaccess-group0' ], [ 'customjsprotected', 'bogus' ] ],
 -                      [ [ 'badaccess-group0' ] ]
 +                      [ [ 'badaccess-group0' ] ],
 +                      [ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
                );
        }
  
@@@ -550,8 -542,6 +554,8 @@@
         * @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' );
@@@ -564,8 -554,7 +568,8 @@@
  
                        [ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
                        [ [ 'badaccess-group0' ] ],
 -                      [ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ]
 +                      [ [ 'badaccess-group0' ], [ 'customjsonprotected', 'bogus' ] ],
 +                      [ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
                );
        }
  
@@@ -575,8 -564,6 +579,8 @@@
         * @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' );
@@@ -589,8 -576,7 +593,8 @@@
  
                        [ [ 'badaccess-group0' ] ],
                        [ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
 -                      [ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ]
 +                      [ [ 'badaccess-group0' ], [ 'customcssprotected', 'bogus' ] ],
 +                      [ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
                );
        }
  
@@@ -600,8 -586,6 +604,8 @@@
         * @covers Title::checkUserConfigPermissions
         */
        public function testOtherNonConfigEditPermissions() {
 +              $prefix = MediaWikiServices::getInstance()->getContentLanguage()->
 +                      getFormattedNsText( NS_PROJECT );
                $this->setUser( $this->userName );
  
                $this->setTitle( NS_USER, $this->altUserName . '/tempo' );
@@@ -614,31 -598,7 +618,31 @@@
  
                        [ [ 'badaccess-group0' ] ],
                        [ [ 'badaccess-group0' ] ],
 -                      [ [ 'badaccess-group0' ] ]
 +                      [ [ 'badaccess-group0' ] ],
 +                      [ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
 +              );
 +      }
 +
 +      /**
 +       * @todo This should use data providers like the other methods here.
 +       * @covers Title::checkUserConfigPermissions
 +       */
 +      public function testPatrolActionConfigEditPermissions() {
 +              $prefix = MediaWikiServices::getInstance()->getContentLanguage()->
 +                      getFormattedNsText( NS_PROJECT );
 +              $this->setUser( 'anon' );
 +              $this->setTitle( NS_USER, 'ToPatrolOrNotToPatrol' );
 +              $this->runConfigEditPermissions(
 +                      [ [ 'badaccess-group0' ] ],
 +
 +                      [ [ 'badaccess-group0' ] ],
 +                      [ [ 'badaccess-group0' ] ],
 +                      [ [ 'badaccess-group0' ] ],
 +
 +                      [ [ 'badaccess-group0' ] ],
 +                      [ [ 'badaccess-group0' ] ],
 +                      [ [ 'badaccess-group0' ] ],
 +                      [ [ 'badaccess-groups', "[[$prefix:Administrators|Administrators]]", 1 ] ]
                );
        }
  
@@@ -649,8 -609,7 +653,8 @@@
                $resultMyJs,
                $resultUserCss,
                $resultUserJson,
 -              $resultUserJs
 +              $resultUserJs,
 +              $resultPatrol
        ) {
                $this->setUserPerm( '' );
                $result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
@@@ -680,10 -639,6 +684,10 @@@
                $result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
                $this->assertEquals( $resultUserJs, $result );
  
 +              $this->setUserPerm( '' );
 +              $result = $this->title->getUserPermissionsErrors( 'patrol', $this->user );
 +              $this->assertEquals( $resultPatrol, $result );
 +
                $this->setUserPerm( [ 'edituserjs', 'edituserjson', 'editusercss' ] );
                $result = $this->title->getUserPermissionsErrors( 'bogus', $this->user );
                $this->assertEquals( [ [ 'badaccess-group0' ] ], $result );
@@@ -692,6 -647,10 +696,10 @@@
        /**
         * @todo This test method should be split up into separate test methods and
         * data providers
+        *
+        * This test is failing per T201776.
+        *
+        * @group Broken
         * @covers Title::checkPageRestrictions
         */
        public function testPageRestrictions() {