Merge "jquery.accessKeyLabel: make modifier info public"

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

diff --git a/tests/phpunit/includes/PreferencesTest.php b/tests/phpunit/includes/PreferencesTest.php
index 3dec2da..fe431b6 100644 (file)
--- a/tests/phpunit/includes/PreferencesTest.php
+++ b/tests/phpunit/includes/PreferencesTest.php
@@ -45,45 +45,45 @@ class PreferencesTest extends MediaWikiTestCase {
         * Placeholder to verify bug 34302
         * @covers Preferences::profilePreferences
         */
-       public function testEmailFieldsWhenUserHasNoEmail() {
+       public function testEmailAuthenticationFieldWhenUserHasNoEmail() {
                $prefs = $this->prefsFor( 'noemail' );
                $this->assertArrayHasKey( 'cssclass',
-                       $prefs['emailaddress']
+                       $prefs['emailauthentication']
                );
-               $this->assertEquals( 'mw-email-none', $prefs['emailaddress']['cssclass'] );
+               $this->assertEquals( 'mw-email-none', $prefs['emailauthentication']['cssclass'] );
        }
 
        /**
         * Placeholder to verify bug 34302
         * @covers Preferences::profilePreferences
         */
-       public function testEmailFieldsWhenUserEmailNotAuthenticated() {
+       public function testEmailAuthenticationFieldWhenUserEmailNotAuthenticated() {
                $prefs = $this->prefsFor( 'notauth' );
                $this->assertArrayHasKey( 'cssclass',
-                       $prefs['emailaddress']
+                       $prefs['emailauthentication']
                );
-               $this->assertEquals( 'mw-email-not-authenticated', $prefs['emailaddress']['cssclass'] );
+               $this->assertEquals( 'mw-email-not-authenticated', $prefs['emailauthentication']['cssclass'] );
        }
 
        /**
         * Placeholder to verify bug 34302
         * @covers Preferences::profilePreferences
         */
-       public function testEmailFieldsWhenUserEmailIsAuthenticated() {
+       public function testEmailAuthenticationFieldWhenUserEmailIsAuthenticated() {
                $prefs = $this->prefsFor( 'auth' );
                $this->assertArrayHasKey( 'cssclass',
-                       $prefs['emailaddress']
+                       $prefs['emailauthentication']
                );
-               $this->assertEquals( 'mw-email-authenticated', $prefs['emailaddress']['cssclass'] );
+               $this->assertEquals( 'mw-email-authenticated', $prefs['emailauthentication']['cssclass'] );
        }
 
        /** Helper */
        protected function prefsFor( $user_key ) {
                $preferences = array();
                Preferences::profilePreferences(
-                       $this->prefUsers[$user_key]
-                       , $this->context
-                       , $preferences
+                       $this->prefUsers[$user_key],
+                       $this->context,
+                       $preferences
                );
 
                return $preferences;