dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a BloomCacheRedisTest class
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
PreferencesTest.php
diff --git
a/tests/phpunit/includes/PreferencesTest.php
b/tests/phpunit/includes/PreferencesTest.php
index
392ad08
..
5841bb6
100644
(file)
--- a/
tests/phpunit/includes/PreferencesTest.php
+++ b/
tests/phpunit/includes/PreferencesTest.php
@@
-4,11
+4,16
@@
* @group Database
*/
class PreferencesTest extends MediaWikiTestCase {
* @group Database
*/
class PreferencesTest extends MediaWikiTestCase {
- /** Array of User objects */
+ /**
+ * @var User[]
+ */
private $prefUsers;
private $prefUsers;
+ /**
+ * @var RequestContext
+ */
private $context;
private $context;
- function __construct() {
+
public
function __construct() {
parent::__construct();
$this->prefUsers['noemail'] = new User;
parent::__construct();
$this->prefUsers['noemail'] = new User;
@@
-40,7
+45,7
@@
class PreferencesTest extends MediaWikiTestCase {
* Placeholder to verify bug 34302
* @covers Preferences::profilePreferences
*/
* Placeholder to verify bug 34302
* @covers Preferences::profilePreferences
*/
- function testEmailFieldsWhenUserHasNoEmail() {
+
public
function testEmailFieldsWhenUserHasNoEmail() {
$prefs = $this->prefsFor( 'noemail' );
$this->assertArrayHasKey( 'cssclass',
$prefs['emailaddress']
$prefs = $this->prefsFor( 'noemail' );
$this->assertArrayHasKey( 'cssclass',
$prefs['emailaddress']
@@
-52,7
+57,7
@@
class PreferencesTest extends MediaWikiTestCase {
* Placeholder to verify bug 34302
* @covers Preferences::profilePreferences
*/
* Placeholder to verify bug 34302
* @covers Preferences::profilePreferences
*/
- function testEmailFieldsWhenUserEmailNotAuthenticated() {
+
public
function testEmailFieldsWhenUserEmailNotAuthenticated() {
$prefs = $this->prefsFor( 'notauth' );
$this->assertArrayHasKey( 'cssclass',
$prefs['emailaddress']
$prefs = $this->prefsFor( 'notauth' );
$this->assertArrayHasKey( 'cssclass',
$prefs['emailaddress']
@@
-64,7
+69,7
@@
class PreferencesTest extends MediaWikiTestCase {
* Placeholder to verify bug 34302
* @covers Preferences::profilePreferences
*/
* Placeholder to verify bug 34302
* @covers Preferences::profilePreferences
*/
- function testEmailFieldsWhenUserEmailIsAuthenticated() {
+
public
function testEmailFieldsWhenUserEmailIsAuthenticated() {
$prefs = $this->prefsFor( 'auth' );
$this->assertArrayHasKey( 'cssclass',
$prefs['emailaddress']
$prefs = $this->prefsFor( 'auth' );
$this->assertArrayHasKey( 'cssclass',
$prefs['emailaddress']
@@
-73,12
+78,12
@@
class PreferencesTest extends MediaWikiTestCase {
}
/** Helper */
}
/** Helper */
- function prefsFor( $user_key ) {
+
protected
function prefsFor( $user_key ) {
$preferences = array();
Preferences::profilePreferences(
$preferences = array();
Preferences::profilePreferences(
- $this->prefUsers[$user_key]
- , $this->context
-
,
$preferences
+ $this->prefUsers[$user_key]
,
+ $this->context,
+ $preferences
);
return $preferences;
);
return $preferences;