mirror of
https://github.com/Froxlor/Froxlor.git
synced 2024-09-21 10:27:29 +00:00
added first test for Mysqls-ApiCommand
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
parent
c149cbacf7
commit
6006b16c95
@ -139,11 +139,11 @@ class Mysqls extends ApiCommand implements ResourceEntity
|
||||
|
||||
$_mailerror = false;
|
||||
try {
|
||||
$this->mail->Subject = $mail_subject;
|
||||
$this->mail->AltBody = $mail_body;
|
||||
$this->mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
|
||||
$this->mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
|
||||
$this->mail->Send();
|
||||
$this->mailer()->Subject = $mail_subject;
|
||||
$this->mailer()->AltBody = $mail_body;
|
||||
$this->mailer()->MsgHTML(str_replace("\n", "<br />", $mail_body));
|
||||
$this->mailer()->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
|
||||
$this->mailer()->Send();
|
||||
} catch (phpmailerException $e) {
|
||||
$mailerr_msg = $e->errorMessage();
|
||||
$_mailerror = true;
|
||||
@ -157,7 +157,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
|
||||
standard_error('errorsendingmail', $userinfo['email'], true);
|
||||
}
|
||||
|
||||
$this->mail->ClearAddresses();
|
||||
$this->mailer()->ClearAddresses();
|
||||
}
|
||||
$this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_WARNING, "[API] added mysql-database '" . $username . "'");
|
||||
|
||||
|
@ -20,6 +20,7 @@
|
||||
<directory>tests/Extras</directory>
|
||||
<directory>tests/Backup</directory>
|
||||
<directory>tests/DomainZones</directory>
|
||||
<directory>tests/Mysqls</directory>
|
||||
</testsuite>
|
||||
</testsuites>
|
||||
|
||||
|
@ -15,7 +15,7 @@ class CustomersTest extends TestCase
|
||||
|
||||
$data = [
|
||||
'new_loginname' => 'test1',
|
||||
'email' => 'test@froxlor.org',
|
||||
'email' => 'team@froxlor.org',
|
||||
'firstname' => 'Test',
|
||||
'name' => 'Testman',
|
||||
'customernumber' => 1337,
|
||||
@ -46,7 +46,7 @@ class CustomersTest extends TestCase
|
||||
$json_result = Customers::getLocal($admin_userdata, $data)->add();
|
||||
$result = json_decode($json_result, true)['data'];
|
||||
$this->assertEquals(1, $result['customerid']);
|
||||
$this->assertEquals('test@froxlor.org', $result['email']);
|
||||
$this->assertEquals('team@froxlor.org', $result['email']);
|
||||
$this->assertEquals(1337, $result['customernumber']);
|
||||
$this->assertEquals(15, $result['subdomains']);
|
||||
$this->assertEquals('secret', $result['custom_notes']);
|
||||
@ -147,7 +147,7 @@ class CustomersTest extends TestCase
|
||||
$result = json_decode($json_result, true)['data'];
|
||||
|
||||
$this->assertEquals(1, $result['customerid']);
|
||||
$this->assertEquals('test@froxlor.org', $result['email']);
|
||||
$this->assertEquals('team@froxlor.org', $result['email']);
|
||||
$this->assertEquals(1337, $result['customernumber']);
|
||||
$this->assertEquals(15, $result['subdomains']);
|
||||
$this->assertEquals('Sparkle', $result['theme']);
|
||||
|
33
tests/Mysqls/MysqlsTest.php
Normal file
33
tests/Mysqls/MysqlsTest.php
Normal file
@ -0,0 +1,33 @@
|
||||
<?php
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
/**
|
||||
*
|
||||
* @covers ApiCommand
|
||||
* @covers ApiParameter
|
||||
* @covers Mysqls
|
||||
*/
|
||||
class MysqlsTest extends TestCase
|
||||
{
|
||||
|
||||
public function testCustomerMysqlsAdd()
|
||||
{
|
||||
global $admin_userdata;
|
||||
|
||||
// get customer
|
||||
$json_result = Customers::getLocal($admin_userdata, array(
|
||||
'loginname' => 'test1'
|
||||
))->get();
|
||||
$customer_userdata = json_decode($json_result, true)['data'];
|
||||
|
||||
$data = [
|
||||
'mysql_password' => generatePassword(),
|
||||
'description' => 'testdb',
|
||||
'sendinfomail' => true
|
||||
];
|
||||
$json_result = Mysqls::getLocal($customer_userdata, $data)->add();
|
||||
$result = json_decode($json_result, true)['data'];
|
||||
$this->assertEquals('testdb', $result['description']);
|
||||
$this->assertEquals(0, $result['dbserver']);
|
||||
}
|
||||
}
|
@ -25,6 +25,10 @@ file_put_contents($userdata, $userdata_content);
|
||||
// include autoloader / api / etc
|
||||
require dirname(__DIR__) . '/lib/classes/api/api_includes.inc.php';
|
||||
|
||||
Database::needRoot(true);
|
||||
Database::query("DROP DATABASE IF EXISTS `test1sql1`;");
|
||||
Database::needRoot(false);
|
||||
|
||||
// clear all tables
|
||||
Database::query("TRUNCATE TABLE `" . TABLE_PANEL_CUSTOMERS . "`;");
|
||||
Database::query("TRUNCATE TABLE `" . TABLE_PANEL_DOMAINS . "`;");
|
||||
|
Loading…
Reference in New Issue
Block a user