Merge branch 'feature/PTDL-472' of https://github.com/Pterodactyl/Panel into feature/PTDL-472

This commit is contained in:
Dane Everitt 2017-08-12 16:30:29 -05:00
commit fd24729ab9
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
15 changed files with 165 additions and 166 deletions

View file

@ -87,7 +87,7 @@ class AssignmentServiceTest extends TestCase
{
$data = [
'allocation_ip' => '192.168.1.1',
'allocation_ports' => ['1024']
'allocation_ports' => ['1024'],
];
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
@ -112,7 +112,7 @@ class AssignmentServiceTest extends TestCase
{
$data = [
'allocation_ip' => '192.168.1.1',
'allocation_ports' => ['1024-1026']
'allocation_ports' => ['1024-1026'],
];
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
@ -142,7 +142,6 @@ class AssignmentServiceTest extends TestCase
$this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
$this->service->handle($this->node->id, $data);
}
/**
@ -307,7 +306,7 @@ class AssignmentServiceTest extends TestCase
{
$data = [
'allocation_ip' => '192.168.1.1',
'allocation_ports' => ['1024']
'allocation_ports' => ['1024'],
];
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();