maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

add more tests for Email-ApiCommands

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-12 21:29:03 +01:00
parent a7523bbdea
commit 05857985f8
3 changed files with 143 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/classes/api/abstract.ApiParameter.php
View File

@@ -103,24 +103,6 @@ abstract class ApiParameter
return $param_value;
}
/**
* update value of parameter
*
* @param string $param
* @param mixed $value
*
* @throws Exception
* @return boolean
*/
protected function updateParam($param, $value = null)
{
if (isset($this->cmd_params[$param])) {
$this->cmd_params[$param] = $value;
return true;
}
throw new Exception("Unable to update parameter '" . $param . "' as it does not exist", 500);
}
/**
* return list of all parameters
*

22
lib/classes/api/commands/class.EmailAccounts.php
View File

@@ -317,15 +317,20 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
}
}
if ($quota != $result['quota']) {
if ($customer['email_quota'] != '-1' && ($quota == 0 || ($quota + $customer['email_quota_used'] - $result['quota']) > $customer['email_quota'])) {
standard_error('allocatetoomuchquota', $quota, true);
if (Settings::Get('system.mail_quota_enabled') == 1) {
if ($quota != $result['quota']) {
if ($customer['email_quota'] != '-1' && ($quota == 0 || ($quota + $customer['email_quota_used'] - $result['quota']) > $customer['email_quota'])) {
standard_error('allocatetoomuchquota', $quota, true);
}
if (! empty($upd_query)) {
$upd_query .= ", ";
}
$upd_query .= "`quota` = :quota";
$upd_params['quota'] = $quota;
}
if (! empty($upd_query)) {
$upd_query .= ", ";
}
$upd_query .= "`quota` = :quota";
$upd_params['quota'] = $quota;
} else {
// disable
$quota = 0;
}
// build update query
@@ -416,6 +421,7 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
"id" => $id
);
Database::pexecute($stmt, $params, true, true);
$result['popaccountid'] = 0;
if (Settings::Get('system.mail_quota_enabled') == '1' && $customer['email_quota'] != '-1') {
$quota = (int) $result['quota'];

130
tests/Emails/EmailsTest.php
View File

@@ -222,7 +222,7 @@ class MailsTest extends TestCase
/**
* @depends testCustomerEmailForwardersAddAnother
*/
public function testCustomerEmailForwardersDeleteunknown()
public function testCustomerEmailForwardersDeleteUnknown()
{
global $admin_userdata;
@@ -240,4 +240,132 @@ class MailsTest extends TestCase
$this->expectExceptionMessage("Unknown forwarder id");
EmailForwarders::getLocal($customer_userdata, $data)->delete();
}
public function testCustomerEmailsListing()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$json_result = Emails::getLocal($customer_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(2, $result['count']);
$this->assertEquals("info@test2.local", $result['list'][0]['email']);
$this->assertEquals("@test2.local", $result['list'][1]['email']);
}
public function testCustomerEmailAccountsAdd()
{
global $admin_userdata;
Settings::Set('panel.sendalternativemail', 1, true);
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'emailaddr' => 'info@test2.local',
'email_password' => generatePassword(),
'alternative_email' => 'noone@example.com',
'email_quota' => 1337
];
$json_result = EmailAccounts::getLocal($customer_userdata, $data)->add();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['popaccountid']);
}
public function testAdminEmailAccountsUpdate()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'emailaddr' => 'info@test2.local',
'email_password' => generatePassword(),
'alternative_email' => 'noone@example.com',
'email_quota' => 1338
];
$json_result = EmailAccounts::getLocal($customer_userdata, $data)->update();
$result = json_decode($json_result, true)['data'];
// quota is disabled
$this->assertEquals(0, $result['quota']);
}
public function testAdminEmailAccountsUndefinedGet()
{
global $admin_userdata;
$this->expectExceptionCode(303);
EmailAccounts::getLocal($admin_userdata)->get();
}
public function testAdminEmailAccountsUndefinedListing()
{
global $admin_userdata;
$this->expectExceptionCode(303);
EmailAccounts::getLocal($admin_userdata)->listing();
}
public function testCustomerEmailAccountsDelete()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'emailaddr' => 'info@test2.local',
'delete_userfiles' => 1
];
$json_result = EmailAccounts::getLocal($customer_userdata, $data)->delete();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(0, $result['popaccountid']);
}
public function testCustomerEmailsDelete()
{
global $admin_userdata;
// remove possible existing delete tasks
Database::query("TRUNCATE `".TABLE_PANEL_TASKS."`");
Settings::Set('panel.sendalternativemail', 0, true);
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
// add account
$data = [
'emailaddr' => 'info@test2.local',
'email_password' => generatePassword(),
'alternative_email' => 'noone@example.com'
];
$json_result = EmailAccounts::getLocal($customer_userdata, $data)->add();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(2, $result['popaccountid']);
// now delete the whole address
$data = [
'emailaddr' => 'info@test2.local',
'delete_userfiles' => 1
];
$json_result = Emails::getLocal($customer_userdata, $data)->delete();
$result = json_decode($json_result, true)['data'];
$this->assertEquals("info@test2.local", $result['email_full']);
}
}