Merge branch 'master' into issue/fix-3

This commit is contained in:
Lance Pioch
2024-04-18 17:20:23 -04:00
committed by GitHub
182 changed files with 7002 additions and 1762 deletions

View File

@@ -2,6 +2,7 @@
namespace App\Tests\Integration\Api\Client\Server;
use App\Enums\ServerState;
use Illuminate\Http\Response;
use App\Models\Server;
use App\Models\Permission;
@@ -93,7 +94,7 @@ class SettingsControllerTest extends ClientApiIntegrationTestCase
->assertStatus(Response::HTTP_ACCEPTED);
$server = $server->refresh();
$this->assertSame(Server::STATUS_INSTALLING, $server->status);
$this->assertSame(ServerState::Installing, $server->status);
}
/**

View File

@@ -2,6 +2,7 @@
namespace App\Tests\Integration\Api\Remote;
use App\Enums\ServerState;
use App\Models\Node;
use App\Models\User;
use App\Models\Server;
@@ -207,9 +208,9 @@ class SftpAuthenticationControllerTest extends IntegrationTestCase
public static function serverStateDataProvider(): array
{
return [
'installing' => [Server::STATUS_INSTALLING],
'suspended' => [Server::STATUS_SUSPENDED],
'restoring a backup' => [Server::STATUS_RESTORING_BACKUP],
'installing' => [ServerState::Installing->value],
'suspended' => [ServerState::Suspended->value],
'restoring a backup' => [ServerState::RestoringBackup->value],
];
}

View File

@@ -2,6 +2,7 @@
namespace App\Tests\Integration\Jobs\Schedule;
use App\Enums\ServerState;
use Carbon\Carbon;
use Carbon\CarbonImmutable;
use GuzzleHttp\Psr7\Request;
@@ -151,7 +152,7 @@ class RunTaskJobTest extends IntegrationTestCase
public function testTaskIsNotRunIfServerIsSuspended(): void
{
$server = $this->createServerModel([
'status' => Server::STATUS_SUSPENDED,
'status' => ServerState::Suspended,
]);
$schedule = Schedule::factory()->for($server)->create([

View File

@@ -2,8 +2,8 @@
namespace App\Tests\Integration\Services\Servers;
use App\Enums\ServerState;
use Mockery\MockInterface;
use App\Models\Server;
use App\Services\Servers\SuspensionService;
use App\Tests\Integration\IntegrationTestCase;
use App\Repositories\Daemon\DaemonServerRepository;
@@ -47,7 +47,7 @@ class SuspensionServiceTest extends IntegrationTestCase
$server->refresh();
$this->assertFalse($server->isSuspended());
$server->update(['status' => Server::STATUS_SUSPENDED]);
$server->update(['status' => ServerState::Suspended]);
$this->getService()->toggle($server);
$server->refresh();