StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Return tests to passing now that we don't ignore a critical event...

Browse source
This commit is contained in:
DaneEveritt 2022-05-29 17:52:14 -04:00
parent 09832cc558
commit 0621d8475d
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
14 changed files with 44 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/Integration/Api/Client/AccountControllerTest.php
View file

@ -2,6 +2,7 @@
namespace Pterodactyl\Tests\Integration\Api\Client;
use Illuminate\Support\Str;
use Pterodactyl\Models\User;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Hash;
@ -41,13 +42,13 @@ class AccountControllerTest extends ClientApiIntegrationTestCase
$user = User::factory()->create();
$response = $this->actingAs($user)->putJson('/api/client/account/email', [
'email' => 'hodor@example.com',
'email' => $email = Str::random() . '@example.com',
'password' => 'password',
]);
$response->assertStatus(Response::HTTP_NO_CONTENT);
$this->assertDatabaseHas('users', ['id' => $user->id, 'email' => 'hodor@example.com']);
$this->assertDatabaseHas('users', ['id' => $user->id, 'email' => $email]);
}
/**

2
tests/Integration/Api/Client/Server/Schedule/DeleteServerScheduleTest.php
View file

@ -50,7 +50,7 @@ class DeleteServerScheduleTest extends ClientApiIntegrationTestCase
public function testNotFoundErrorIsReturnedIfScheduleDoesNotBelongToServer()
{
[$user, $server] = $this->generateTestAccount();
[, $server2] = $this->generateTestAccount(['user_id' => $user->id]);
$server2 = $this->createServerModel(['owner_id' => $user->id]);
$schedule = Schedule::factory()->create(['server_id' => $server2->id]);

2
tests/Integration/Api/Client/Server/Schedule/GetServerSchedulesTest.php
View file

@ -64,7 +64,7 @@ class GetServerSchedulesTest extends ClientApiIntegrationTestCase
public function testScheduleBelongingToAnotherServerCannotBeViewed()
{
[$user, $server] = $this->generateTestAccount();
[, $server2] = $this->generateTestAccount(['user_id' => $user->id]);
$server2 = $this->createServerModel(['owner_id' => $user->id]);
$schedule = Schedule::factory()->create(['server_id' => $server2->id]);

2
tests/Integration/Api/Client/Server/Schedule/UpdateServerScheduleTest.php
View file

@ -58,7 +58,7 @@ class UpdateServerScheduleTest extends ClientApiIntegrationTestCase
public function testErrorIsReturnedIfScheduleDoesNotBelongToServer()
{
[$user, $server] = $this->generateTestAccount();
[, $server2] = $this->generateTestAccount(['user_id' => $user->id]);
$server2 = $this->createServerModel(['owner_id' => $user->id]);
$schedule = Schedule::factory()->create(['server_id' => $server2->id]);

2
tests/Integration/Api/Client/Server/ScheduleTask/CreateServerScheduleTaskTest.php
View file

@ -145,7 +145,7 @@ class CreateServerScheduleTaskTest extends ClientApiIntegrationTestCase
public function testErrorIsReturnedIfScheduleDoesNotBelongToServer()
{
[$user, $server] = $this->generateTestAccount();
[, $server2] = $this->generateTestAccount(['user_id' => $user->id]);
$server2 = $this->createServerModel(['owner_id' => $user->id]);
/** @var \Pterodactyl\Models\Schedule $schedule */
$schedule = Schedule::factory()->create(['server_id' => $server2->id]);

3
tests/Integration/Api/Client/Server/Subuser/DeleteSubuserTest.php
View file

@ -32,8 +32,9 @@ class DeleteSubuserTest extends ClientApiIntegrationTestCase
/** @var \Pterodactyl\Models\User $differentUser */
$differentUser = User::factory()->create();
$real = Uuid::uuid4()->toString();
// Generate a UUID that lines up with a user in the database if it were to be cast to an int.
$uuid = $differentUser->id . str_repeat('a', strlen((string) $differentUser->id)) . substr(Uuid::uuid4()->toString(), 8);
$uuid = $differentUser->id . substr($real, strlen((string) $differentUser->id));
/** @var \Pterodactyl\Models\User $subuser */
$subuser = User::factory()->create(['uuid' => $uuid]);