Merge "FauxRequest: don’t override getValues()"

[lhc/web/wiklou.git] / tests / phpunit / includes / preferences / DefaultPreferencesFactoryTest.php

diff --git a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
index a459441..c7a3fe6 100644 (file)
--- a/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
+++ b/tests/phpunit/includes/preferences/DefaultPreferencesFactoryTest.php
@@ -50,10 +50,10 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
 
        /**
         * Get a basic PreferencesFactory for testing with.
-        * @param PermissionManager|null $manager
+        * @param PermissionManager $mockPM
         * @return DefaultPreferencesFactory
         */
-       protected function getPreferencesFactory( PermissionManager $manager = null ) {
+       protected function getPreferencesFactory( PermissionManager $mockPM ) {
                $mockNsInfo = $this->createMock( NamespaceInfo::class );
                $mockNsInfo->method( 'getValidNamespaces' )->willReturn( [
                        NS_MAIN, NS_TALK, NS_USER, NS_USER_TALK
@@ -61,8 +61,6 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
                $mockNsInfo->expects( $this->never() )
                        ->method( $this->anythingBut( 'getValidNamespaces', '__destruct' ) );
 
-               $mockPermissionManager = $manager ?? $this->createMock( PermissionManager::class );
-
                return new DefaultPreferencesFactory(
                        new LoggedServiceOptions( self::$serviceOptionsAccessLog,
                                DefaultPreferencesFactory::$constructorOptions, $this->config ),
@@ -70,7 +68,7 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
                        AuthManager::singleton(),
                        MediaWikiServices::getInstance()->getLinkRenderer(),
                        $mockNsInfo,
-                       $mockPermissionManager
+                       $mockPM
                );
        }
 
@@ -81,7 +79,9 @@ class DefaultPreferencesFactoryTest extends \MediaWikiTestCase {
                $this->setTemporaryHook( 'GetPreferences', null );
 
                $testUser = $this->getTestUser();
-               $form = $this->getPreferencesFactory()->getForm( $testUser->getUser(), $this->context );
+               $pm = $this->createMock( PermissionManager::class );
+               $pm->method( 'userHasRight' )->willReturn( true );
+               $form = $this->getPreferencesFactory( $pm )->getForm( $testUser->getUser(), $this->context );
                $this->assertInstanceOf( PreferencesFormOOUI::class, $form );
                $this->assertCount( 5, $form->getPreferenceSections() );
        }