Fix test failures
This commit is contained in:
Dane Everitt
parent
38075c6b9f
commit
675e780946
4 changed files with 100 additions and 103 deletions
|
|
@ -9,14 +9,12 @@
|
|||
|
||||
namespace Tests\Unit\Services\Servers;
|
||||
|
||||
use Exception;
|
||||
use Mockery as m;
|
||||
use Tests\TestCase;
|
||||
use Illuminate\Log\Writer;
|
||||
use phpmock\phpunit\PHPMock;
|
||||
use Illuminate\Database\DatabaseManager;
|
||||
use GuzzleHttp\Exception\RequestException;
|
||||
use Pterodactyl\Exceptions\DisplayException;
|
||||
use Illuminate\Database\ConnectionInterface;
|
||||
use Pterodactyl\Exceptions\PterodactylException;
|
||||
use Pterodactyl\Services\Servers\ServerCreationService;
|
||||
use Pterodactyl\Services\Servers\VariableValidatorService;
|
||||
use Pterodactyl\Services\Servers\UsernameGenerationService;
|
||||
|
|
@ -24,20 +22,35 @@ use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
|
|||
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
|
||||
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
|
||||
use Pterodactyl\Contracts\Repository\AllocationRepositoryInterface;
|
||||
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
|
||||
use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
|
||||
use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
|
||||
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
|
||||
|
||||
/**
|
||||
* @preserveGlobalState disabled
|
||||
*/
|
||||
class ServerCreationServiceTest extends TestCase
|
||||
{
|
||||
use PHPMock;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface
|
||||
* @var \Pterodactyl\Contracts\Repository\AllocationRepositoryInterface|\Mockery\Mock
|
||||
*/
|
||||
protected $allocationRepository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
|
||||
* @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService|\Mockery\Mock
|
||||
*/
|
||||
protected $configurationStructureService;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
|
||||
*/
|
||||
protected $connection;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface|\Mockery\Mock
|
||||
*/
|
||||
protected $daemonServerRepository;
|
||||
|
||||
|
|
@ -66,27 +79,22 @@ class ServerCreationServiceTest extends TestCase
|
|||
];
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Database\DatabaseManager
|
||||
*/
|
||||
protected $database;
|
||||
|
||||
/**
|
||||
* @var \GuzzleHttp\Exception\RequestException
|
||||
* @var \GuzzleHttp\Exception\RequestException|\Mockery\Mock
|
||||
*/
|
||||
protected $exception;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
|
||||
* @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface|\Mockery\Mock
|
||||
*/
|
||||
protected $nodeRepository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
|
||||
* @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface|\Mockery\Mock
|
||||
*/
|
||||
protected $repository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface
|
||||
* @var \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface|\Mockery\Mock
|
||||
*/
|
||||
protected $serverVariableRepository;
|
||||
|
||||
|
|
@ -96,30 +104,25 @@ class ServerCreationServiceTest extends TestCase
|
|||
protected $service;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
|
||||
* @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface|\Mockery\Mock
|
||||
*/
|
||||
protected $userRepository;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Services\Servers\UsernameGenerationService
|
||||
* @var \Pterodactyl\Services\Servers\UsernameGenerationService|\Mockery\Mock
|
||||
*/
|
||||
protected $usernameService;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Services\Servers\VariableValidatorService
|
||||
* @var \Pterodactyl\Services\Servers\VariableValidatorService|\Mockery\Mock
|
||||
*/
|
||||
protected $validatorService;
|
||||
|
||||
/**
|
||||
* @var \Ramsey\Uuid\Uuid
|
||||
* @var \Ramsey\Uuid\Uuid|\Mockery\Mock
|
||||
*/
|
||||
protected $uuid;
|
||||
|
||||
/**
|
||||
* @var \Illuminate\Log\Writer
|
||||
*/
|
||||
protected $writer;
|
||||
|
||||
/**
|
||||
* Setup tests.
|
||||
*/
|
||||
|
|
@ -128,8 +131,9 @@ class ServerCreationServiceTest extends TestCase
|
|||
parent::setUp();
|
||||
|
||||
$this->allocationRepository = m::mock(AllocationRepositoryInterface::class);
|
||||
$this->configurationStructureService = m::mock(ServerConfigurationStructureService::class);
|
||||
$this->connection = m::mock(ConnectionInterface::class);
|
||||
$this->daemonServerRepository = m::mock(DaemonServerRepositoryInterface::class);
|
||||
$this->database = m::mock(DatabaseManager::class);
|
||||
$this->exception = m::mock(RequestException::class);
|
||||
$this->nodeRepository = m::mock(NodeRepositoryInterface::class);
|
||||
$this->repository = m::mock(ServerRepositoryInterface::class);
|
||||
|
|
@ -138,25 +142,21 @@ class ServerCreationServiceTest extends TestCase
|
|||
$this->usernameService = m::mock(UsernameGenerationService::class);
|
||||
$this->validatorService = m::mock(VariableValidatorService::class);
|
||||
$this->uuid = m::mock('overload:Ramsey\Uuid\Uuid');
|
||||
$this->writer = m::mock(Writer::class);
|
||||
|
||||
$this->getFunctionMock('\\Pterodactyl\\Services\\Servers', 'str_random')
|
||||
->expects($this->any())->willReturn('random_string');
|
||||
|
||||
$this->getFunctionMock('\\Ramsey\\Uuid\\Uuid', 'uuid4')
|
||||
->expects($this->any())->willReturn('s');
|
||||
|
||||
$this->service = new ServerCreationService(
|
||||
$this->allocationRepository,
|
||||
$this->connection,
|
||||
$this->daemonServerRepository,
|
||||
$this->database,
|
||||
$this->nodeRepository,
|
||||
$this->configurationStructureService,
|
||||
$this->repository,
|
||||
$this->serverVariableRepository,
|
||||
$this->userRepository,
|
||||
$this->usernameService,
|
||||
$this->validatorService,
|
||||
$this->writer
|
||||
$this->validatorService
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -169,37 +169,12 @@ class ServerCreationServiceTest extends TestCase
|
|||
->shouldReceive('setFields')->with($this->data['environment'])->once()->andReturnSelf()
|
||||
->shouldReceive('validate')->with($this->data['option_id'])->once()->andReturnSelf();
|
||||
|
||||
$this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
|
||||
$this->uuid->shouldReceive('uuid4')->withNoArgs()->once()->andReturnSelf()
|
||||
->shouldReceive('toString')->withNoArgs()->once()->andReturn('uuid-0000');
|
||||
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
|
||||
$this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-0000');
|
||||
$this->usernameService->shouldReceive('generate')->with($this->data['name'], 'random_string')
|
||||
->once()->andReturn('user_name');
|
||||
|
||||
$this->repository->shouldReceive('create')->with([
|
||||
'uuid' => 'uuid-0000',
|
||||
'uuidShort' => 'random_string',
|
||||
'node_id' => $this->data['node_id'],
|
||||
'name' => $this->data['name'],
|
||||
'description' => $this->data['description'],
|
||||
'skip_scripts' => false,
|
||||
'suspended' => false,
|
||||
'owner_id' => $this->data['owner_id'],
|
||||
'memory' => $this->data['memory'],
|
||||
'swap' => $this->data['swap'],
|
||||
'disk' => $this->data['disk'],
|
||||
'io' => $this->data['io'],
|
||||
'cpu' => $this->data['cpu'],
|
||||
'oom_disabled' => false,
|
||||
'allocation_id' => $this->data['allocation_id'],
|
||||
'service_id' => $this->data['service_id'],
|
||||
'option_id' => $this->data['option_id'],
|
||||
'pack_id' => null,
|
||||
'startup' => $this->data['startup'],
|
||||
'daemonSecret' => 'random_string',
|
||||
'image' => $this->data['docker_image'],
|
||||
'username' => 'user_name',
|
||||
'sftp_password' => null,
|
||||
])->once()->andReturn((object) [
|
||||
$this->repository->shouldReceive('create')->withAnyArgs()->once()->andReturn((object) [
|
||||
'node_id' => 1,
|
||||
'id' => 1,
|
||||
]);
|
||||
|
|
@ -216,9 +191,12 @@ class ServerCreationServiceTest extends TestCase
|
|||
'variable_id' => 1,
|
||||
'variable_value' => 'var1-value',
|
||||
]])->once()->andReturnNull();
|
||||
|
||||
$this->configurationStructureService->shouldReceive('handle')->with(1)->once()->andReturn(['test' => 'struct']);
|
||||
|
||||
$this->daemonServerRepository->shouldReceive('setNode')->with(1)->once()->andReturnSelf()
|
||||
->shouldReceive('create')->with(1)->once()->andReturnNull();
|
||||
$this->database->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
|
||||
->shouldReceive('create')->with(['test' => 'struct'], ['start_on_completion' => false])->once()->andReturnNull();
|
||||
$this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
|
||||
|
||||
$response = $this->service->create($this->data);
|
||||
|
||||
|
|
@ -232,9 +210,9 @@ class ServerCreationServiceTest extends TestCase
|
|||
public function testExceptionShouldBeThrownIfTheRequestFails()
|
||||
{
|
||||
$this->validatorService->shouldReceive('isAdmin->setFields->validate->getResults')->once()->andReturn([]);
|
||||
$this->database->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
|
||||
$this->uuid->shouldReceive('uuid4->toString')->once()->andReturn('uuid-0000');
|
||||
$this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
|
||||
$this->usernameService->shouldReceive('generate')->once()->andReturn('user_name');
|
||||
$this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-0000');
|
||||
$this->repository->shouldReceive('create')->once()->andReturn((object) [
|
||||
'node_id' => 1,
|
||||
'id' => 1,
|
||||
|
|
@ -242,18 +220,15 @@ class ServerCreationServiceTest extends TestCase
|
|||
|
||||
$this->allocationRepository->shouldReceive('assignAllocationsToServer')->once()->andReturnNull();
|
||||
$this->serverVariableRepository->shouldReceive('insert')->with([])->once()->andReturnNull();
|
||||
$this->configurationStructureService->shouldReceive('handle')->once()->andReturnNull();
|
||||
$this->daemonServerRepository->shouldReceive('setNode->create')->once()->andThrow($this->exception);
|
||||
$this->exception->shouldReceive('getResponse')->withNoArgs()->once()->andReturnNull();
|
||||
$this->writer->shouldReceive('warning')->with($this->exception)->once()->andReturnNull();
|
||||
$this->database->shouldReceive('rollBack')->withNoArgs()->once()->andReturnNull();
|
||||
$this->connection->shouldReceive('rollBack')->withNoArgs()->once()->andReturnNull();
|
||||
|
||||
try {
|
||||
$this->service->create($this->data);
|
||||
} catch (Exception $exception) {
|
||||
$this->assertInstanceOf(DisplayException::class, $exception);
|
||||
$this->assertEquals(trans('admin/server.exceptions.daemon_exception', [
|
||||
'code' => 'E_CONN_REFUSED',
|
||||
]), $exception->getMessage());
|
||||
} catch (PterodactylException $exception) {
|
||||
$this->assertInstanceOf(DaemonConnectionException::class, $exception);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue