Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix integration tests

Browse source
This commit is contained in:
Matthew Penner 2021-10-23 13:34:41 -06:00
parent b966069946
commit 2948e344d2
No known key found for this signature in database
GPG key ID: BAB67850901908A8
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/Transformers/Api/Application/EggTransformer.php
View file

@ -28,6 +28,18 @@ class EggTransformer extends Transformer
public function transform(Egg $model): array public function transform(Egg $model): array
{ {
// Fixes PHP returning an empty array rather than an empty object.
// Removing associative = true would also fix this, but that causes
// the tests to fail and may have other undiscovered side effects.
$configFiles = json_decode($model->config_files, true);
if ($configFiles === []) {
$configFiles = new \stdClass();
}
$configStartup = json_decode($model->config_startup, true);
if ($configStartup === []) {
$configStartup = new \stdClass();
}
return [ return [
'id' => $model->id, 'id' => $model->id,
'uuid' => $model->uuid, 'uuid' => $model->uuid,
@ -41,8 +53,8 @@ class EggTransformer extends Transformer
'docker_image' => count($model->docker_images) > 0 ? $model->docker_images[0] : '', 'docker_image' => count($model->docker_images) > 0 ? $model->docker_images[0] : '',
'docker_images' => $model->docker_images, 'docker_images' => $model->docker_images,
'config' => [ 'config' => [
'files' => json_decode($model->config_files), 'files' => $configFiles,
'startup' => json_decode($model->config_startup), 'startup' => $configStartup,
'stop' => $model->config_stop, 'stop' => $model->config_stop,
'file_denylist' => $model->file_denylist, 'file_denylist' => $model->file_denylist,
'extends' => $model->config_from, 'extends' => $model->config_from,

5
tests/Integration/Api/Application/Eggs/EggControllerTest.php
View file

@ -23,7 +23,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
} }
/** /**
* Test that all of the eggs belonging to a given nest can be returned. * Test that all the eggs belonging to a given nest can be returned.
*/ */
public function testListAllEggsInNest() public function testListAllEggsInNest()
{ {
@ -44,7 +44,6 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
'files' => [], 'files' => [],
'startup' => ['done'], 'startup' => ['done'],
'stop', 'stop',
'logs' => ['custom', 'location'],
'extends', 'extends',
], ],
], ],
@ -89,7 +88,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
} }
/** /**
* Test that a single egg and all of the defined relationships can be returned. * Test that a single egg and all the defined relationships can be returned.
*/ */
public function testReturnSingleEggWithRelationships() public function testReturnSingleEggWithRelationships()
{ {