Merge "Increase Opera minimum for Grades A and C to 15"

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

diff --git a/tests/phpunit/includes/PreferencesTest.php b/tests/phpunit/includes/PreferencesTest.php
index b25e046..4a15225 100644 (file)
--- a/tests/phpunit/includes/PreferencesTest.php
+++ b/tests/phpunit/includes/PreferencesTest.php
@@ -150,20 +150,9 @@ class PreferencesTest extends MediaWikiTestCase {
 
        /** Helper */
        protected function prefsFor( $user_key ) {
-               // TODO This should use Preferences::getPreferences() instead of calling internal methods.
-               // Unfortunately that currently ignores the $user parameter if it has cached data, even for
-               // a different user...
-               OutputPage::setupOOUI(
-                       strtolower( $this->context->getSkin()->getSkinName() ),
-                       $this->context->getLanguage()->getDir()
-               );
-               $preferences = [];
-               Preferences::profilePreferences(
+               return Preferences::getPreferences(
                        $this->prefUsers[$user_key],
-                       $this->context,
-                       $preferences
+                       $this->context
                );
-
-               return $preferences;
        }
 }