Add integration test for remaining application api user endpoints

Author: DaneEveritt

app/Transformers/Api/Application/UserTransformer.php

@@ -53,6 +53,8 @@ public function transform(User $user): array
      *
      * @param \Pterodactyl\Models\User $user
      * @return \League\Fractal\Resource\Collection|\League\Fractal\Resource\NullResource
+     *
+     * @throws \Pterodactyl\Exceptions\Transformer\InvalidTransformerLevelException
      */
     public function includeServers(User $user)
     {

database/factories/ModelFactory.php

@@ -1,5 +1,6 @@
 <?php
 
+use Cake\Chronos\Chronos;
 use Faker\Generator as Faker;
 use Pterodactyl\Models\ApiKey;
 
@@ -57,6 +58,8 @@
         'language' => 'en',
         'root_admin' => false,
         'use_totp' => false,
+        'created_at' => Chronos::now(),
+        'updated_at' => Chronos::now(),
     ];
 });
 
@@ -69,7 +72,7 @@
 $factory->define(Pterodactyl\Models\Location::class, function (Faker $faker) {
     return [
         'id' => $faker->unique()->randomNumber(),
-        'short' => $faker->domainWord,
+        'short' => $faker->unique()->domainWord,
         'long' => $faker->catchPhrase,
     ];
 });

tests/Integration/Api/Application/Location/LocationControllerTest.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Tests\Integration\Api\Application\Location;
 
 use Pterodactyl\Models\Node;
+use Illuminate\Http\Response;
 use Pterodactyl\Models\Location;
 use Pterodactyl\Transformers\Api\Application\NodeTransformer;
 use Pterodactyl\Transformers\Api\Application\ServerTransformer;
@@ -17,8 +18,8 @@ public function testGetLocations()
     {
         $locations = factory(Location::class)->times(2)->create();
 
-        $response = $this->json('GET', '/api/application/locations');
-        $response->assertStatus(200);
+        $response = $this->getJson('/api/application/locations');
+        $response->assertStatus(Response::HTTP_OK);
         $response->assertJsonCount(2, 'data');
         $response->assertJsonStructure([
             'object',
@@ -71,8 +72,8 @@ public function testGetSingleLocation()
     {
         $location = factory(Location::class)->create();
 
-        $response = $this->json('GET', '/api/application/locations/' . $location->id);
-        $response->assertStatus(200);
+        $response = $this->getJson('/api/application/locations/' . $location->id);
+        $response->assertStatus(Response::HTTP_OK);
         $response->assertJsonCount(2);
         $response->assertJsonStructure(['object', 'attributes' => ['id', 'short', 'long', 'created_at', 'updated_at']]);
         $response->assertJson([
@@ -95,8 +96,8 @@ public function testRelationshipsCanBeLoaded()
         $location = factory(Location::class)->create();
         $server = $this->createServerModel(['user_id' => $this->getApiUser()->id, 'location_id' => $location->id]);
 
-        $response = $this->json('GET', '/api/application/locations/' . $location->id . '?include=servers,nodes');
-        $response->assertStatus(200);
+        $response = $this->getJson('/api/application/locations/' . $location->id . '?include=servers,nodes');
+        $response->assertStatus(Response::HTTP_OK);
         $response->assertJsonCount(2)->assertJsonCount(2, 'attributes.relationships');
         $response->assertJsonStructure([
             'attributes' => [
@@ -145,8 +146,8 @@ public function testKeyWithoutPermissionCannotLoadRelationship()
         $location = factory(Location::class)->create();
         factory(Node::class)->create(['location_id' => $location->id]);
 
-        $response = $this->json('GET', '/api/application/locations/' . $location->id . '?include=nodes');
-        $response->assertStatus(200);
+        $response = $this->getJson('/api/application/locations/' . $location->id . '?include=nodes');
+        $response->assertStatus(Response::HTTP_OK);
         $response->assertJsonCount(2)->assertJsonCount(1, 'attributes.relationships');
         $response->assertJsonStructure([
             'attributes' => [
@@ -176,7 +177,7 @@ public function testKeyWithoutPermissionCannotLoadRelationship()
      */
     public function testGetMissingLocation()
     {
-        $response = $this->json('GET', '/api/application/locations/nil');
+        $response = $this->getJson('/api/application/locations/nil');
         $this->assertNotFoundJson($response);
     }
 
@@ -189,7 +190,7 @@ public function testErrorReturnedIfNoPermission()
         $location = factory(Location::class)->create();
         $this->createNewDefaultApiKey($this->getApiUser(), ['r_locations' => 0]);
 
-        $response = $this->json('GET', '/api/application/locations/' . $location->id);
+        $response = $this->getJson('/api/application/locations/' . $location->id);
         $this->assertAccessDeniedJson($response);
     }
 
@@ -201,7 +202,7 @@ public function testResourceIsNotExposedWithoutPermissions()
     {
         $this->createNewDefaultApiKey($this->getApiUser(), ['r_locations' => 0]);
 
-        $response = $this->json('GET', '/api/application/locations/nil');
+        $response = $this->getJson('/api/application/locations/nil');
         $this->assertAccessDeniedJson($response);
     }
 }

tests/Integration/Api/Application/Users/ExternalUserControllerTest.php

@@ -3,6 +3,7 @@
 namespace Pterodactyl\Tests\Integration\Api\Application\Users;
 
 use Pterodactyl\Models\User;
+use Illuminate\Http\Response;
 use Pterodactyl\Tests\Integration\Api\Application\ApplicationApiIntegrationTestCase;
 
 class ExternalUserControllerTest extends ApplicationApiIntegrationTestCase
@@ -14,8 +15,8 @@ public function testGetRemoteUser()
     {
         $user = factory(User::class)->create();
 
-        $response = $this->json('GET', '/api/application/users/external/' . $user->external_id);
-        $response->assertStatus(200);
+        $response = $this->getJson('/api/application/users/external/' . $user->external_id);
+        $response->assertStatus(Response::HTTP_OK);
         $response->assertJsonCount(2);
         $response->assertJsonStructure([
             'object',
@@ -47,9 +48,9 @@ public function testGetRemoteUser()
     /**
      * Test that an invalid external ID returns a 404 error.
      */
-    public function testGetMissingLocation()
+    public function testGetMissingUser()
     {
-        $response = $this->json('GET', '/api/application/users/external/nil');
+        $response = $this->getJson('/api/application/users/external/nil');
         $this->assertNotFoundJson($response);
     }
 
@@ -62,7 +63,7 @@ public function testErrorReturnedIfNoPermission()
         $user = factory(User::class)->create();
         $this->createNewDefaultApiKey($this->getApiUser(), ['r_users' => 0]);
 
-        $response = $this->json('GET', '/api/application/users/external/' . $user->external_id);
+        $response = $this->getJson('/api/application/users/external/' . $user->external_id);
         $this->assertAccessDeniedJson($response);
     }
 
@@ -74,7 +75,7 @@ public function testResourceIsNotExposedWithoutPermissions()
     {
         $this->createNewDefaultApiKey($this->getApiUser(), ['r_users' => 0]);
 
-        $response = $this->json('GET', '/api/application/users/external/nil');
+        $response = $this->getJson('/api/application/users/external/nil');
         $this->assertAccessDeniedJson($response);
     }
 }