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

Remove old application API base transformer

Browse source
This commit is contained in:
Dane Everitt 2021-08-07 13:25:06 -07:00
parent cf500a1a54
commit 5c81f820d8
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
19 changed files with 101 additions and 468 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tests/Integration/Api/Application/ApplicationApiIntegrationTestCase.php
View file

@ -3,13 +3,12 @@
namespace Pterodactyl\Tests\Integration\Api\Application;
use Pterodactyl\Models\User;
use PHPUnit\Framework\Assert;
use Pterodactyl\Models\ApiKey;
use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Transformers\Api\Transformer;
use Pterodactyl\Tests\Integration\IntegrationTestCase;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Pterodactyl\Tests\Traits\Integration\CreatesTestModels;
use Pterodactyl\Transformers\Api\Application\BaseTransformer;
use Pterodactyl\Tests\Traits\Http\IntegrationJsonRequestAssertions;
abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
@ -129,16 +128,10 @@ abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
*
* @param string $abstract
*
* @return \Pterodactyl\Transformers\Api\Application\BaseTransformer
* @throws \Illuminate\Contracts\Container\BindingResolutionException
* @return \Pterodactyl\Transformers\Api\Transformer
*/
protected function getTransformer(string $abstract): BaseTransformer
protected function getTransformer(string $abstract): Transformer
{
/** @var \Pterodactyl\Transformers\Api\Application\BaseTransformer $transformer */
$transformer = $this->app->make($abstract);
Assert::assertInstanceOf(BaseTransformer::class, $transformer);
return $transformer;
return new $abstract;
}
}

3
tests/Integration/IntegrationTestCase.php
View file

@ -6,7 +6,6 @@ use Carbon\CarbonImmutable;
use Pterodactyl\Tests\TestCase;
use Illuminate\Database\Eloquent\Model;
use Pterodactyl\Tests\Traits\Integration\CreatesTestModels;
use Pterodactyl\Transformers\Api\Application\BaseTransformer;
abstract class IntegrationTestCase extends TestCase
{
@ -40,7 +39,7 @@ abstract class IntegrationTestCase extends TestCase
protected function formatTimestamp(string $timestamp): string
{
return CarbonImmutable::createFromFormat(CarbonImmutable::DEFAULT_TO_STRING_FORMAT, $timestamp)
->setTimezone(BaseTransformer::RESPONSE_TIMEZONE)
->setTimezone('UTC')
->toIso8601String();
}
}