diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php index 1f02409ff48e2b0ade616825cba23c2ea61283b5..188d1d753cbaa22c6b398e9e115a21bd8a33fbec 100644 --- a/tests/PHPUnit/Integration/Plugins/LoginTest.php +++ b/tests/PHPUnit/Integration/Plugins/LoginTest.php @@ -36,7 +36,7 @@ class Plugins_LoginTest extends DatabaseTestCase // we make sure the tests don't depend on the config file content Config::getInstance()->superuser = array( - 'login' => 'superusertest', + 'login' => 'superUserLogin', 'password' => md5('passwordsuperusertest'), 'email' => 'superuser@example.com' ); diff --git a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php index 3c7b5fcb856d13e4ea7257423beb0b2ff647b3ae..6ebc02f42c08fc82751a1f12834a036410b9b21b 100644 --- a/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php +++ b/tests/PHPUnit/Integration/Plugins/UsersManagerTest.php @@ -68,6 +68,7 @@ class Plugins_UsersManagerTest extends DatabaseTestCase $user['password'] = md5($newPassword); $user['email'] = $newEmail; $user['alias'] = $newAlias; + $user['superuser_access'] = 0; $this->assertEquals($user, $userAfter); } @@ -452,14 +453,13 @@ class Plugins_UsersManagerTest extends DatabaseTestCase $users = API::getInstance()->getUsers(); $users = $this->_removeNonTestableFieldsFromUsers($users); - $user1 = array('login' => "gegg4564eqgeqag", 'password' => md5("geqgegagae"), 'alias' => "alias", 'email' => "tegst@tesgt.com"); - $user2 = array('login' => "geggeqge632ge56a4qag", 'password' => md5("geqgegeagae"), 'alias' => "alias", 'email' => "tesggt@tesgt.com"); - $user3 = array('login' => "geggeqgeqagqegg", 'password' => md5("geqgeaggggae"), 'alias' => 'geggeqgeqagqegg', 'email' => "tesgggt@tesgt.com"); + $user1 = array('login' => "gegg4564eqgeqag", 'password' => md5("geqgegagae"), 'alias' => "alias", 'email' => "tegst@tesgt.com", 'superuser_access' => 0); + $user2 = array('login' => "geggeqge632ge56a4qag", 'password' => md5("geqgegeagae"), 'alias' => "alias", 'email' => "tesggt@tesgt.com", 'superuser_access' => 0); + $user3 = array('login' => "geggeqgeqagqegg", 'password' => md5("geqgeaggggae"), 'alias' => 'geggeqgeqagqegg', 'email' => "tesgggt@tesgt.com", 'superuser_access' => 0); $expectedUsers = array($user1, $user2, $user3); $this->assertEquals($expectedUsers, $users); $this->assertEquals(array($user1), $this->_removeNonTestableFieldsFromUsers(API::getInstance()->getUsers('gegg4564eqgeqag'))); $this->assertEquals(array($user1, $user2), $this->_removeNonTestableFieldsFromUsers(API::getInstance()->getUsers('gegg4564eqgeqag,geggeqge632ge56a4qag'))); - } protected function _removeNonTestableFieldsFromUsers($users)