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
26 changes: 22 additions & 4 deletions app/Actions/CheckForScheduledSpeedtests.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,28 @@ public function handle(): void
return;
}

RunSpeedtest::runIf(
$this->isSpeedtestDue(schedule: $schedule),
scheduled: true,
);
if (! $this->isSpeedtestDue(schedule: $schedule)) {
return;
}

if (config('speedtest.mode', 'random') === 'sequential') {
$servers = array_filter(
array_map('trim', explode(',', (string) config('speedtest.servers')))
);

if (count($servers)) {
foreach ($servers as $serverId) {
RunSpeedtest::run(
scheduled: true,
serverId: (int) $serverId,
);
}

return;
}
}

RunSpeedtest::run(scheduled: true);
}

/**
Expand Down
2 changes: 2 additions & 0 deletions config/speedtest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

'servers' => env('SPEEDTEST_SERVERS'),

'mode' => env('SPEEDTEST_MODE', 'random'),

'blocked_servers' => env('SPEEDTEST_BLOCKED_SERVERS'),

'interface' => env('SPEEDTEST_INTERFACE'),
Expand Down
35 changes: 35 additions & 0 deletions tests/Feature/ScheduledSpeedtestModeTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php

use App\Actions\CheckForScheduledSpeedtests;
use App\Models\Result;
use Illuminate\Support\Facades\Bus;
use Illuminate\Support\Facades\Cache;

beforeEach(function () {
Cache::flush();
Bus::fake();
});

test('runs single speedtest when mode random', function () {
config()->set('speedtest.schedule', '* * * * *');
config()->set('speedtest.mode', 'random');
config()->set('speedtest.servers', '1,2');

CheckForScheduledSpeedtests::run();

expect(Result::count())->toBe(1);
});

test('runs sequential speedtests when mode sequential', function () {
config()->set('speedtest.schedule', '* * * * *');
config()->set('speedtest.mode', 'sequential');
config()->set('speedtest.servers', '1,2');

CheckForScheduledSpeedtests::run();

expect(Result::count())->toBe(2);
expect(Result::orderBy('id')->pluck('data->server->id')->toArray())->toBe([
1,
2,
]);
});