Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/Actions/CreateActivityAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace App\Actions;

use App\Jobs\IngestActivity;
use App\Jobs\IngestActivityJob;
use App\Models\Project;
use App\ValueObjects\Event;
use Illuminate\Support\Facades\DB;
Expand All @@ -23,7 +23,7 @@ public function handle(Project $project, array $events): void
'events' => $events,
]);

IngestActivity::dispatch($activity, now());
IngestActivityJob::dispatch($activity, now());
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Queue\Queueable;

final class IngestActivity implements ShouldQueue
final class IngestActivityJob implements ShouldQueue
{
use Queueable;

Expand Down
14 changes: 7 additions & 7 deletions tests/Feature/Http/Api/ActivityControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
declare(strict_types=1);

use App\Enums\EventType;
use App\Jobs\IngestActivity;
use App\Jobs\IngestActivityJob;
use App\Models\Project;
use Illuminate\Support\Facades\Queue;

beforeEach()->only();

it('can create an activity', function () {
// Arrange...
Queue::fake([IngestActivity::class]);
Queue::fake([IngestActivityJob::class]);
$project = Project::factory()->create()->fresh();

$events = [
Expand All @@ -29,12 +29,12 @@
$activities = $project->activities;
expect($activities)->toHaveCount(1);

Queue::assertPushed(IngestActivity::class, 1);
Queue::assertPushed(IngestActivityJob::class, 1);
});

it('does not handle empty events', function () {
// Arrange...
Queue::fake([IngestActivity::class]);
Queue::fake([IngestActivityJob::class]);
$project = Project::factory()->create()->fresh();

// Act...
Expand All @@ -50,12 +50,12 @@
$activities = $project->activities;
expect($activities)->toHaveCount(0);

Queue::assertNotPushed(IngestActivity::class);
Queue::assertNotPushed(IngestActivityJob::class);
});

it('does not handle corrupted events', function () {
// Arrange...
Queue::fake([IngestActivity::class]);
Queue::fake([IngestActivityJob::class]);
$project = Project::factory()->create()->fresh();

// Act...
Expand Down Expand Up @@ -86,5 +86,5 @@
$activities = $project->activities;
expect($activities)->toHaveCount(0);

Queue::assertNotPushed(IngestActivity::class);
Queue::assertNotPushed(IngestActivityJob::class);
});
4 changes: 2 additions & 2 deletions tests/Unit/Actions/CreateActivityActionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use App\Actions\CreateActivityAction;
use App\Enums\EventType;
use App\Jobs\IngestActivity;
use App\Jobs\IngestActivityJob;
use App\Models\Project;
use App\ValueObjects\Event;
use Illuminate\Support\Facades\Queue;
Expand Down Expand Up @@ -44,5 +44,5 @@
),
);

Queue::assertPushed(IngestActivity::class, 1);
Queue::assertPushed(IngestActivityJob::class, 1);
});
12 changes: 6 additions & 6 deletions tests/Unit/Jobs/IngestActivityTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
declare(strict_types=1);

use App\Enums\EventType;
use App\Jobs\IngestActivity;
use App\Jobs\IngestActivityJob;
use App\Models\Activity;
use App\Models\Page;
use Illuminate\Support\Facades\Date;
Expand All @@ -21,7 +21,7 @@
],
]);

$job = new IngestActivity($activity, now());
$job = new IngestActivityJob($activity, now());

// act...
$job->handle();
Expand All @@ -47,7 +47,7 @@
],
]);

$job = new IngestActivity($activity, now());
$job = new IngestActivityJob($activity, now());

// act...
$job->handle();
Expand All @@ -70,7 +70,7 @@
],
]);

$job = new IngestActivity($activity, now());
$job = new IngestActivityJob($activity, now());

// act...
$job->handle();
Expand Down Expand Up @@ -100,11 +100,11 @@
],
]);

$jobA = new IngestActivity(
$jobA = new IngestActivityJob(
$activityA,
Date::create(2025, 1, 1, 1, 10, 0)
);
$jobB = new IngestActivity(
$jobB = new IngestActivityJob(
$activityB,
Date::create(2025, 1, 1, 2, 30, 0)
);
Expand Down