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

Merge branch 'develop' into lancepioch-patch-1

Browse source
This commit is contained in:
Dane Everitt 2021-04-17 12:02:19 -07:00 committed by GitHub
commit 13919df603
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/Integration/Api/Application/Location/LocationControllerTest.php
View file

@ -18,7 +18,7 @@ class LocationControllerTest extends ApplicationApiIntegrationTestCase
{
$locations = Location::factory()->times(2)->create();
$response = $this->getJson('/api/application/locations');
$response = $this->getJson('/api/application/locations?per_page=60');
$response->assertStatus(Response::HTTP_OK);
$response->assertJsonCount(2, 'data');
$response->assertJsonStructure([
@ -38,7 +38,7 @@ class LocationControllerTest extends ApplicationApiIntegrationTestCase
'pagination' => [
'total' => 2,
'count' => 2,
'per_page' => 100,
'per_page' => 60,
'current_page' => 1,
'total_pages' => 1,
],

4
tests/Integration/Api/Application/Users/UserControllerTest.php
View file

@ -18,7 +18,7 @@ class UserControllerTest extends ApplicationApiIntegrationTestCase
{
$user = User::factory()->create();
$response = $this->getJson('/api/application/users');
$response = $this->getJson('/api/application/users?per_page=60');
$response->assertStatus(Response::HTTP_OK);
$response->assertJsonCount(2, 'data');
$response->assertJsonStructure([
@ -38,7 +38,7 @@ class UserControllerTest extends ApplicationApiIntegrationTestCase
'pagination' => [
'total' => 2,
'count' => 2,
'per_page' => 100,
'per_page' => 60,
'current_page' => 1,
'total_pages' => 1,
],