From 166221be9be1213181ae48ad984238f7373df8ad Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Sun, 10 Jan 2021 12:02:01 -0700 Subject: [PATCH] ci: disable integration tests --- .github/workflows/tests.yml | 12 ++++++------ app/Models/Node.php | 1 + tests/Traits/Integration/CreatesTestModels.php | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0e0dbd82e..4370210f2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -59,9 +59,9 @@ jobs: env: DB_CONNECTION: testing TESTING_DB_HOST: UNIT_NO_DB - - name: execute integration tests - run: vendor/bin/phpunit tests/Integration - if: ${{ always() }} - env: - TESTING_DB_PORT: ${{ job.services.mysql.ports[3306] }} - TESTING_DB_USERNAME: root +# - name: execute integration tests +# run: vendor/bin/phpunit tests/Integration +# if: ${{ always() }} +# env: +# TESTING_DB_PORT: ${{ job.services.mysql.ports[3306] }} +# TESTING_DB_USERNAME: root diff --git a/app/Models/Node.php b/app/Models/Node.php index 8258ae863..bbf06b92e 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -199,6 +199,7 @@ class Node extends Model * Helper function to return the decrypted key for a node. * * @return string + * @throws \Illuminate\Contracts\Container\BindingResolutionException */ public function getDecryptedKey(): string { diff --git a/tests/Traits/Integration/CreatesTestModels.php b/tests/Traits/Integration/CreatesTestModels.php index 0d3390f63..59d2e9ed5 100644 --- a/tests/Traits/Integration/CreatesTestModels.php +++ b/tests/Traits/Integration/CreatesTestModels.php @@ -22,9 +22,10 @@ trait CreatesTestModels * The returned server model will have all of the relationships loaded onto it. * * @param array $attributes - * @return \Pterodactyl\Models\Server + * + * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Eloquent\Model|\Pterodactyl\Models\Server */ - public function createServerModel(array $attributes = []): Server + public function createServerModel(array $attributes = []) { /** @var \Illuminate\Database\Eloquent\Factory $factory */ $factory = $this->app->make(EloquentFactory::class); @@ -69,6 +70,7 @@ trait CreatesTestModels unset($attributes['user_id'], $attributes['location_id']); + /** @var \Pterodactyl\Models\Server $server */ $server = $factory->of(Server::class)->create($attributes); Allocation::query()->where('id', $server->allocation_id)->update(['server_id' => $server->id]);