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

auto-format all files; add table-definitions to test-bootstrap file

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-21 12:24:07 +01:00
parent 1ff784198c
commit 97b5439c0d
209 changed files with 6840 additions and 4534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
tests/Admins/AdminsTest.php
View File

@@ -5,6 +5,7 @@ use Froxlor\Database\Database;
use Froxlor\Api\Commands\Admins;
/**
*
* @covers ApiCommand
* @covers ApiParameter
* @covers Admins
@@ -15,7 +16,7 @@ class AdminsTest extends TestCase
public function testAdminAdminsAdd()
{
global $admin_userdata;
$data = [
'new_loginname' => 'reseller',
'email' => 'testreseller@froxlor.org',
@@ -37,22 +38,22 @@ class AdminsTest extends TestCase
'phpenabled' => 1,
'ip' => array()
];
$json_result = Admins::getLocal($admin_userdata, $data)->add();
$result = json_decode($json_result, true)['data'];
$admin_id = $result['adminid'];
// get admin and check results
$json_result = Admins::getLocal($admin_userdata, array(
'id' => $admin_id
))->get();
$result = json_decode($json_result, true)['data'];
$this->assertEquals('reseller', $result['loginname']);
$this->assertEquals('testreseller@froxlor.org', $result['email']);
$this->assertEquals(0, $result['customers_see_all']);
}
/**
*
* @depends testAdminAdminsAdd
@@ -60,17 +61,17 @@ class AdminsTest extends TestCase
public function testAdminAdminsAddLoginnameExists()
{
global $admin_userdata;
$data = [
'new_loginname' => 'reseller',
'email' => 'testreseller@froxlor.org',
'name' => 'Testreseller'
];
$this->expectExceptionMessage('Loginname reseller already exists');
Admins::getLocal($admin_userdata, $data)->add();
}
/**
*
* @depends testAdminAdminsAddLoginnameExists
@@ -78,13 +79,13 @@ class AdminsTest extends TestCase
public function testAdminAdminsAddLoginnameIsSystemaccount()
{
global $admin_userdata;
$data = [
'new_loginname' => 'web2',
'email' => 'testreseller@froxlor.org',
'name' => 'Testreseller'
];
$this->expectExceptionMessage('You cannot create accounts which are similar to system accounts (as for example begin with "web"). Please enter another account name.');
Admins::getLocal($admin_userdata, $data)->add();
}
@@ -96,13 +97,13 @@ class AdminsTest extends TestCase
public function testAdminAdminsAddLoginnameInvalid()
{
global $admin_userdata;
$data = [
'new_loginname' => 'reslr-',
'email' => 'testreseller@froxlor.org',
'name' => 'Testreseller'
];
$this->expectExceptionMessage('Loginname "reslr-" contains illegal characters.');
Admins::getLocal($admin_userdata, $data)->add();
}
@@ -114,13 +115,13 @@ class AdminsTest extends TestCase
public function testAdminAdminsAddLoginnameInvalidEmail()
{
global $admin_userdata;
$data = [
'new_loginname' => 'reslr',
'email' => 'testreseller.froxlor.org',
'name' => 'Testreseller'
];
$this->expectExceptionMessage('Email-address testreseller.froxlor.org contains invalid characters or is incomplete');
Admins::getLocal($admin_userdata, $data)->add();
}
@@ -130,7 +131,7 @@ class AdminsTest extends TestCase
global $admin_userdata;
$testadmin_userdata = $admin_userdata;
$testadmin_userdata['adminsession'] = 0;
$this->expectExceptionCode(403);
$this->expectExceptionMessage("Not allowed to execute given command.");
Admins::getLocal($testadmin_userdata, array())->add();
@@ -139,7 +140,7 @@ class AdminsTest extends TestCase
public function testAdminAdminsGetNotFound()
{
global $admin_userdata;
$this->expectExceptionCode(404);
$this->expectExceptionMessage("Admin with loginname 'unknown' could not be found");
// get unknown admin
@@ -151,7 +152,7 @@ class AdminsTest extends TestCase
public function testAdminAdminsList()
{
global $admin_userdata;
$json_result = Admins::getLocal($admin_userdata)->listing();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(2, $result['count']);
@@ -166,11 +167,11 @@ class AdminsTest extends TestCase
))->get();
$reseller_userdata = json_decode($json_result, true)['data'];
$reseller_userdata['adminsession'] = 1;
// try to read superadmin with an access-less reseller account
$this->expectException(Exception::class);
$this->expectExceptionCode(403);
$json_result = Admins::getLocal($reseller_userdata, array(
'loginname' => 'admin'
))->get();
@@ -185,10 +186,10 @@ class AdminsTest extends TestCase
))->get();
$reseller_userdata = json_decode($json_result, true)['data'];
$reseller_userdata['adminsession'] = 1;
$this->expectExceptionCode(403);
$this->expectExceptionMessage("Not allowed to execute given command.");
Admins::getLocal($reseller_userdata)->listing();
}
@@ -209,7 +210,7 @@ class AdminsTest extends TestCase
global $admin_userdata;
$testadmin_userdata = $admin_userdata;
$testadmin_userdata['adminsession'] = 0;
$this->expectExceptionCode(403);
$this->expectExceptionMessage("Not allowed to execute given command.");
Admins::getLocal($testadmin_userdata, array(
@@ -236,9 +237,9 @@ class AdminsTest extends TestCase
'email' => 'testreseller@froxlor.org',
'name' => 'Testreseller'
];
$json_result = Admins::getLocal($admin_userdata, $data)->add();
$json_result = Admins::getLocal($admin_userdata, array(
'loginname' => 'resellertest'
))->delete();
@@ -289,7 +290,7 @@ class AdminsTest extends TestCase
))->update();
$result = json_decode($json_result, true)['data'];
$this->assertEquals(1, $result['deactivated']);
// reactivate
Admins::getLocal($admin_userdata, array(
'loginname' => 'reseller',

39
tests/Extras/DirOptionsTest.php
View File

@@ -17,13 +17,13 @@ class DirOptionsTest extends TestCase
public function testCustomerDirOptionsAdd()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'path' => '/test',
'options_indexes' => 1,
@@ -38,17 +38,17 @@ class DirOptionsTest extends TestCase
$this->assertEquals('1', $result['options_cgi']);
$this->assertEquals('/403.html', $result['error403path']);
}
public function testCustomerDirOptionsAddDuplicatePath()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'path' => '/test',
'options_indexes' => 0,
@@ -64,13 +64,13 @@ class DirOptionsTest extends TestCase
public function testAdminDirOptionsGet()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'id' => 1,
'loginname' => 'test1'
@@ -79,7 +79,7 @@ class DirOptionsTest extends TestCase
$result = json_decode($json_result, true)['data'];
$this->assertEquals($customer_userdata['documentroot'] . 'test/', $result['path']);
}
public function testResellerDirOptionsGet()
{
global $admin_userdata;
@@ -94,7 +94,7 @@ class DirOptionsTest extends TestCase
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'id' => 1,
'loginname' => 'test1'
@@ -103,17 +103,17 @@ class DirOptionsTest extends TestCase
$result = json_decode($json_result, true)['data'];
$this->assertEquals($customer_userdata['documentroot'] . 'test/', $result['path']);
}
public function testCustomerDirOptionsGetNotFound()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'id' => 1337
];
@@ -124,13 +124,13 @@ class DirOptionsTest extends TestCase
public function testCustomerDirOptionsUpdate()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'id' => 1,
'options_indexes' => 0,
@@ -147,7 +147,7 @@ class DirOptionsTest extends TestCase
public function testAdminDirOptionsList()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
@@ -159,27 +159,28 @@ class DirOptionsTest extends TestCase
$this->assertEquals(1, $result['count']);
$this->assertEquals($customer_userdata['documentroot'] . 'test/', $result['list'][0]['path']);
}
/**
*
* @depends testAdminDirOptionsList
*/
public function testCustomerDirOptionsDelete()
{
global $admin_userdata;
// get customer
$json_result = Customers::getLocal($admin_userdata, array(
'loginname' => 'test1'
))->get();
$customer_userdata = json_decode($json_result, true)['data'];
$data = [
'id' => 1
];
$json_result = DirOptions::getLocal($customer_userdata, $data)->delete();
$result = json_decode($json_result, true)['data'];
$this->assertEquals($customer_userdata['documentroot'] . 'test/', $result['path']);
$data = [
'id' => 1
];

3
tests/bootstrap.php
View File

@@ -32,6 +32,9 @@ file_put_contents($userdata, $userdata_content);
// include autoloader / api / etc
require dirname(__DIR__) . '/vendor/autoload.php';
// include table definitions
require dirname(__DIR__) . '/lib/tables.inc.php';
use Froxlor\Database\Database;
use Froxlor\Settings;