From 838fea85adcfd80dab85f19a5c026de6b9b1d21c Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Thu, 23 Jan 2014 04:27:34 +0000
Subject: [PATCH] refs #4564 fixing tests
---
tests/PHPUnit/Integration/Plugins/LoginTest.php | 2 +-
tests/PHPUnit/Integration/Plugins/UsersManagerTest.php | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/PHPUnit/Integration/Plugins/LoginTest.php b/tests/PHPUnit/Integration/Plugins/LoginTest.php
index 1f02409ff4..188d1d753c 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 3c7b5fcb85..6ebc02f42c 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)
--
GitLab