dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

fix integration tests

Browse Source
This commit is contained in:
Matthew Penner 2021-10-23 14:17:05 -06:00
parent 2948e344d2
commit 0e870ab256
No known key found for this signature in database
GPG Key ID: BAB67850901908A8
2 changed files with 4 additions and 16 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,18 +28,6 @@ class EggTransformer extends Transformer
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 [
'id' => $model->id,
'uuid' => $model->uuid,
@ -53,8 +41,8 @@ class EggTransformer extends Transformer
'docker_image' => count($model->docker_images) > 0 ? $model->docker_images[0] : '',
'docker_images' => $model->docker_images,
'config' => [
'files' => $configFiles,
'startup' => $configStartup,
'files' => json_decode($model->config_files),
'startup' => json_decode($model->config_startup),
'stop' => $model->config_stop,
'file_denylist' => $model->file_denylist,
'extends' => $model->config_from,

4
tests/Integration/Api/Application/Eggs/EggControllerTest.php
View File

@ -57,7 +57,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
$expected = json_encode(Arr::sortRecursive($datum['attributes']));
$actual = json_encode(Arr::sortRecursive((new EggTransformer())->transform($egg)));
$this->assertSame(
$this->assertJsonStringEqualsJsonString(
$expected,
$actual,
'Unable to find JSON fragment: ' . PHP_EOL . PHP_EOL . "[{$expected}]" . PHP_EOL . PHP_EOL . 'within' . PHP_EOL . PHP_EOL . "[{$actual}]."
@ -83,7 +83,7 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
$response->assertJson([
'object' => 'egg',
'attributes' => (new EggTransformer())->transform($egg),
'attributes' => json_decode(json_encode((new EggTransformer())->transform($egg)), true),
], true);
}