Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #1022 from coollabsio/ijpatricio-wip-6

Browse Source 
Cleans up tests.
This commit is contained in:
Joao Patricio 2023-04-01 17:37:29 +01:00 committed by GitHub
commit 829a45f410
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/RemoteProcess/RunRemoteProcess.php
View File

@ -33,7 +33,7 @@ class RunRemoteProcess
/** /**
* Create a new job instance. * Create a new job instance.
*/ */
public function __construct(Activity $activity, bool $hideFromOutput, bool $setStatus) public function __construct(Activity $activity, bool $hideFromOutput = false, bool $setStatus = false)
{ {
if ($activity->getExtraProperty('type') !== ActivityTypes::REMOTE_PROCESS->value && $activity->getExtraProperty('type') !== ActivityTypes::DEPLOYMENT->value) { if ($activity->getExtraProperty('type') !== ActivityTypes::REMOTE_PROCESS->value && $activity->getExtraProperty('type') !== ActivityTypes::DEPLOYMENT->value) {

4
bootstrap/helpers.php
View File

@ -23,7 +23,9 @@ function remoteProcess(
?string $deployment_uuid = null, ?string $deployment_uuid = null,
?Model $model = null, ?Model $model = null,
): Activity { ): Activity {
$command_string = implode("\n", $command); $command_string = implode("\n", $command);
// @TODO: Check if the user has access to this server // @TODO: Check if the user has access to this server
// checkTeam($server->team_id); // checkTeam($server->team_id);
@ -31,7 +33,6 @@ function remoteProcess(
return resolve(DispatchRemoteProcess::class, [ return resolve(DispatchRemoteProcess::class, [
'remoteProcessArgs' => new RemoteProcessArgs( 'remoteProcessArgs' => new RemoteProcessArgs(
model: $model,
server_ip: $server->ip, server_ip: $server->ip,
private_key_location: $private_key_location, private_key_location: $private_key_location,
deployment_uuid: $deployment_uuid, deployment_uuid: $deployment_uuid,
@ -41,6 +42,7 @@ function remoteProcess(
port: $server->port, port: $server->port,
user: $server->user, user: $server->user,
type: $deployment_uuid ? ActivityTypes::DEPLOYMENT->value : ActivityTypes::REMOTE_PROCESS->value, type: $deployment_uuid ? ActivityTypes::DEPLOYMENT->value : ActivityTypes::REMOTE_PROCESS->value,
model: $model,
), ),
])(); ])();
} }

22
tests/Feature/DockerCommandsTest.php
View File

@ -16,6 +16,7 @@
it('starts a docker container correctly', function () { it('starts a docker container correctly', function () {
test()->actingAs(User::factory([ test()->actingAs(User::factory([
'uuid' => Str::uuid(), 'uuid' => Str::uuid(),
'email' => Str::uuid().'@example.com', 'email' => Str::uuid().'@example.com',
@ -31,22 +32,9 @@
$containerName = 'coolify_test_' . now()->format('Ymd_his'); $containerName = 'coolify_test_' . now()->format('Ymd_his');
$host = Server::where('name', 'testing-local-docker-container')->first(); $host = Server::where('name', 'testing-local-docker-container')->first();
// Stop testing containers
$activity = remoteProcess([
"docker stop $(docker ps --filter='name={$coolifyNamePrefix}*' -aq)",
"docker rm $(docker ps --filter='name={$coolifyNamePrefix}*' -aq)",
], $host);
throw_if(
$activity->getExtraProperty('exitCode') !== 0,
new RuntimeException($activity->description),
);
expect($activity->getExtraProperty('exitCode'))->toBe(0);
// Assert there's no containers start with coolify_test_* // Assert there's no containers start with coolify_test_*
$activity = remoteProcess([$areThereCoolifyTestContainers], $host); $activity = remoteProcess([$areThereCoolifyTestContainers], $host);
$containers = formatDockerCmdOutputToJson($activity->getExtraProperty('stdout')); $containers = formatDockerCmdOutputToJson($activity->description);
expect($containers)->toBeEmpty(); expect($containers)->toBeEmpty();
// start a container nginx -d --name = $containerName // start a container nginx -d --name = $containerName
@ -55,13 +43,13 @@
// docker ps name = $container // docker ps name = $container
$activity = remoteProcess([$areThereCoolifyTestContainers], $host); $activity = remoteProcess([$areThereCoolifyTestContainers], $host);
$containers = formatDockerCmdOutputToJson($activity->getExtraProperty('stdout')); $containers = formatDockerCmdOutputToJson($activity->description);
expect($containers->where('Names', $containerName)->count())->toBe(1); expect($containers->where('Names', $containerName)->count())->toBe(1);
// Stop testing containers // Stop testing containers
$activity = remoteProcess([ $activity = remoteProcess([
"docker stop $(docker ps --filter='name={$coolifyNamePrefix}*' -aq)", "docker ps --filter='name={$coolifyNamePrefix}*' -aq && " .
"docker rm $(docker ps --filter='name={$coolifyNamePrefix}*' -aq)", "docker rm -f $(docker ps --filter='name={$coolifyNamePrefix}*' -aq)"
], $host); ], $host);
expect($activity->getExtraProperty('exitCode'))->toBe(0); expect($activity->getExtraProperty('exitCode'))->toBe(0);
}); });