mirror of
https://github.com/coollabsio/coolify.git
synced 2026-11-14 08:42:38 -04:00
Andras BacsaiandClaude Opus 5.5
a5acf81751
The executions list polled with the task stored as a model, so a poll after the delete failed to load it and showed a 404. Load the task by id on each request and skip the refresh when it is gone. Return true from delete so the confirmation modal does not refresh the deleted task. Closes #11814 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
128 lines
4.5 KiB
PHP
128 lines
4.5 KiB
PHP
<?php
|
|
|
|
use App\Livewire\Project\Shared\ScheduledTask\Executions;
|
|
use App\Livewire\Project\Shared\ScheduledTask\Show;
|
|
use App\Models\Application;
|
|
use App\Models\Environment;
|
|
use App\Models\InstanceSettings;
|
|
use App\Models\PrivateKey;
|
|
use App\Models\Project;
|
|
use App\Models\ScheduledTask;
|
|
use App\Models\Server;
|
|
use App\Models\Service;
|
|
use App\Models\StandaloneDocker;
|
|
use App\Models\Team;
|
|
use App\Models\User;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Routing\Events\RouteMatched;
|
|
use Illuminate\Support\Facades\Event;
|
|
use Livewire\Livewire;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
beforeEach(function () {
|
|
Server::flushIdentityMap();
|
|
InstanceSettings::forceCreate(['id' => 0]);
|
|
|
|
$this->team = Team::factory()->create();
|
|
$this->user = User::factory()->create();
|
|
$this->team->members()->attach($this->user->id, ['role' => 'owner']);
|
|
$this->actingAs($this->user);
|
|
session(['currentTeam' => $this->team]);
|
|
|
|
$privateKey = PrivateKey::factory()->create(['team_id' => $this->team->id]);
|
|
$server = Server::factory()->create(['team_id' => $this->team->id, 'private_key_id' => $privateKey->id]);
|
|
$this->destination = StandaloneDocker::where('server_id', $server->id)->firstOrFail();
|
|
$this->project = Project::factory()->create(['team_id' => $this->team->id]);
|
|
$this->environment = Environment::factory()->create(['project_id' => $this->project->id]);
|
|
});
|
|
|
|
afterEach(function () {
|
|
Event::forget(RouteMatched::class);
|
|
});
|
|
|
|
/**
|
|
* @param array<string, string> $parameters
|
|
*/
|
|
function bindScheduledTaskDeleteRoute(array $parameters): void
|
|
{
|
|
Event::listen(RouteMatched::class, function (RouteMatched $event) use ($parameters): void {
|
|
foreach ($parameters as $name => $value) {
|
|
$event->route->setParameter($name, $value);
|
|
}
|
|
});
|
|
}
|
|
|
|
test('deleting a service scheduled task returns true so the confirmation modal does not refresh the deleted task', function () {
|
|
$service = Service::factory()->create([
|
|
'environment_id' => $this->environment->id,
|
|
'destination_id' => $this->destination->id,
|
|
'destination_type' => $this->destination->getMorphClass(),
|
|
]);
|
|
$task = ScheduledTask::factory()->create([
|
|
'team_id' => $this->team->id,
|
|
'service_id' => $service->id,
|
|
'name' => 'nightly',
|
|
'command' => 'echo nightly',
|
|
'frequency' => 'daily',
|
|
]);
|
|
$parameters = [
|
|
'project_uuid' => $this->project->uuid,
|
|
'environment_uuid' => $this->environment->uuid,
|
|
'service_uuid' => $service->uuid,
|
|
];
|
|
bindScheduledTaskDeleteRoute([...$parameters, 'task_uuid' => $task->uuid]);
|
|
|
|
Livewire::test(Show::class)
|
|
->call('delete')
|
|
->assertReturned(true)
|
|
->assertRedirect(route('project.service.scheduled-tasks.show', $parameters));
|
|
|
|
expect($task->fresh())->toBeNull();
|
|
});
|
|
|
|
test('deleting an application scheduled task returns true and redirects to the task list', function () {
|
|
$application = Application::factory()->create([
|
|
'environment_id' => $this->environment->id,
|
|
'destination_id' => $this->destination->id,
|
|
'destination_type' => $this->destination->getMorphClass(),
|
|
]);
|
|
$task = ScheduledTask::factory()->create([
|
|
'team_id' => $this->team->id,
|
|
'application_id' => $application->id,
|
|
'name' => 'nightly',
|
|
'command' => 'echo nightly',
|
|
'frequency' => 'daily',
|
|
]);
|
|
$parameters = [
|
|
'project_uuid' => $this->project->uuid,
|
|
'environment_uuid' => $this->environment->uuid,
|
|
'application_uuid' => $application->uuid,
|
|
];
|
|
bindScheduledTaskDeleteRoute([...$parameters, 'task_uuid' => $task->uuid]);
|
|
|
|
Livewire::test(Show::class)
|
|
->call('delete')
|
|
->assertReturned(true)
|
|
->assertRedirect(route('project.application.scheduled-tasks.show', $parameters));
|
|
|
|
expect($task->fresh())->toBeNull();
|
|
});
|
|
|
|
test('the executions poll still works after its task is deleted while the page navigates away', function () {
|
|
$application = Application::factory()->create([
|
|
'environment_id' => $this->environment->id,
|
|
'destination_id' => $this->destination->id,
|
|
'destination_type' => $this->destination->getMorphClass(),
|
|
]);
|
|
$task = ScheduledTask::factory()->create([
|
|
'team_id' => $this->team->id,
|
|
'application_id' => $application->id,
|
|
]);
|
|
|
|
$component = Livewire::test(Executions::class, ['taskId' => $task->id]);
|
|
$task->delete();
|
|
|
|
$component->call('refreshExecutions')->assertOk();
|
|
});
|