X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FPreferencesTest.php;h=4a152253db0e95563ed32eae62b28e031336e52f;hb=870103526c6e9bc6dd9750c89e51f9ac3f2a6481;hp=ada516d554cfbff0bc2b2a4f264c5b8178570db5;hpb=cc0d030a96f9635a7da24cd3e6c42177a3bd100d;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/PreferencesTest.php b/tests/phpunit/includes/PreferencesTest.php index ada516d554..4a152253db 100644 --- a/tests/phpunit/includes/PreferencesTest.php +++ b/tests/phpunit/includes/PreferencesTest.php @@ -131,10 +131,9 @@ class PreferencesTest extends MediaWikiTestCase { ->method( 'getConfig' ) ->willReturn( $configMock ); - $this->setTemporaryHook( 'PreferencesFormPreSave', function( + $this->setTemporaryHook( 'PreferencesFormPreSave', function ( $formData, $form, $user, &$result, $oldUserOptions ) use ( $newOptions, $oldOptions, $userMock ) { - $this->assertSame( $userMock, $user ); foreach ( $newOptions as $option => $value ) { $this->assertSame( $value, $formData[ $option ] ); @@ -151,13 +150,9 @@ class PreferencesTest extends MediaWikiTestCase { /** Helper */ protected function prefsFor( $user_key ) { - $preferences = []; - Preferences::profilePreferences( + return Preferences::getPreferences( $this->prefUsers[$user_key], - $this->context, - $preferences + $this->context ); - - return $preferences; } }