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

added first test for Mysqls-ApiCommand

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-03-25 12:38:57 +02:00
parent c149cbacf7
commit 6006b16c95
5 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/api/commands/class.Mysqls.php
View File

@@ -139,11 +139,11 @@ class Mysqls extends ApiCommand implements ResourceEntity
$_mailerror = false; $_mailerror = false;
try { try {
$this->mail->Subject = $mail_subject; $this->mailer()->Subject = $mail_subject;
$this->mail->AltBody = $mail_body; $this->mailer()->AltBody = $mail_body;
$this->mail->MsgHTML(str_replace("\n", "<br />", $mail_body)); $this->mailer()->MsgHTML(str_replace("\n", "<br />", $mail_body));
$this->mail->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo)); $this->mailer()->AddAddress($userinfo['email'], getCorrectUserSalutation($userinfo));
$this->mail->Send(); $this->mailer()->Send();
} catch (phpmailerException $e) { } catch (phpmailerException $e) {
$mailerr_msg = $e->errorMessage(); $mailerr_msg = $e->errorMessage();
$_mailerror = true; $_mailerror = true;
@@ -157,7 +157,7 @@ class Mysqls extends ApiCommand implements ResourceEntity
standard_error('errorsendingmail', $userinfo['email'], true); 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 . "'"); $this->logger()->logAction($this->isAdmin() ? ADM_ACTION : USR_ACTION, LOG_WARNING, "[API] added mysql-database '" . $username . "'");

1
phpunit.xml
View File

@@ -20,6 +20,7 @@
<directory>tests/Extras</directory> <directory>tests/Extras</directory>
<directory>tests/Backup</directory> <directory>tests/Backup</directory>
<directory>tests/DomainZones</directory> <directory>tests/DomainZones</directory>
<directory>tests/Mysqls</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>

6
tests/Customers/CustomersTest.php
View File

@@ -15,7 +15,7 @@ class CustomersTest extends TestCase
$data = [ $data = [
'new_loginname' => 'test1', 'new_loginname' => 'test1',
'email' => 'test@froxlor.org', 'email' => 'team@froxlor.org',
'firstname' => 'Test', 'firstname' => 'Test',
'name' => 'Testman', 'name' => 'Testman',
'customernumber' => 1337, 'customernumber' => 1337,
@@ -46,7 +46,7 @@ class CustomersTest extends TestCase
$json_result = Customers::getLocal($admin_userdata, $data)->add(); $json_result = Customers::getLocal($admin_userdata, $data)->add();
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['customerid']); $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(1337, $result['customernumber']);
$this->assertEquals(15, $result['subdomains']); $this->assertEquals(15, $result['subdomains']);
$this->assertEquals('secret', $result['custom_notes']); $this->assertEquals('secret', $result['custom_notes']);
@@ -147,7 +147,7 @@ class CustomersTest extends TestCase
$result = json_decode($json_result, true)['data']; $result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['customerid']); $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(1337, $result['customernumber']);
$this->assertEquals(15, $result['subdomains']); $this->assertEquals(15, $result['subdomains']);
$this->assertEquals('Sparkle', $result['theme']); $this->assertEquals('Sparkle', $result['theme']);

33
tests/Mysqls/MysqlsTest.php Normal file
View 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']);
}
}

4
tests/bootstrap.php
View File

@@ -25,6 +25,10 @@ file_put_contents($userdata, $userdata_content);
// include autoloader / api / etc // include autoloader / api / etc
require dirname(__DIR__) . '/lib/classes/api/api_includes.inc.php'; 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 // clear all tables
Database::query("TRUNCATE TABLE `" . TABLE_PANEL_CUSTOMERS . "`;"); Database::query("TRUNCATE TABLE `" . TABLE_PANEL_CUSTOMERS . "`;");
Database::query("TRUNCATE TABLE `" . TABLE_PANEL_DOMAINS . "`;"); Database::query("TRUNCATE TABLE `" . TABLE_PANEL_DOMAINS . "`;");