Use more standardized phpcs
This commit is contained in:
parent
a043071e3c
commit
c449ca5155
493 changed files with 1116 additions and 3903 deletions
|
@ -8,8 +8,6 @@ trait MiddlewareAttributeAssertionsTrait
|
|||
{
|
||||
/**
|
||||
* Assert a request has an attribute assigned to it.
|
||||
*
|
||||
* @param string $attribute
|
||||
*/
|
||||
public function assertRequestHasAttribute(string $attribute)
|
||||
{
|
||||
|
@ -18,8 +16,6 @@ trait MiddlewareAttributeAssertionsTrait
|
|||
|
||||
/**
|
||||
* Assert a request does not have an attribute assigned to it.
|
||||
*
|
||||
* @param string $attribute
|
||||
*/
|
||||
public function assertRequestMissingAttribute(string $attribute)
|
||||
{
|
||||
|
@ -29,8 +25,7 @@ trait MiddlewareAttributeAssertionsTrait
|
|||
/**
|
||||
* Assert a request attribute matches an expected value.
|
||||
*
|
||||
* @param mixed $expected
|
||||
* @param string $attribute
|
||||
* @param mixed $expected
|
||||
*/
|
||||
public function assertRequestAttributeEquals($expected, string $attribute)
|
||||
{
|
||||
|
|
|
@ -70,14 +70,16 @@ abstract class BrowserTestCase extends TestCase
|
|||
*/
|
||||
protected function driver()
|
||||
{
|
||||
$options = (new ChromeOptions)->addArguments([
|
||||
$options = (new ChromeOptions())->addArguments([
|
||||
'--disable-gpu',
|
||||
'--disable-infobars',
|
||||
]);
|
||||
|
||||
return RemoteWebDriver::create(
|
||||
'http://host.pterodactyl.local:4444/wd/hub', DesiredCapabilities::chrome()->setCapability(
|
||||
ChromeOptions::CAPABILITY, $options
|
||||
'http://host.pterodactyl.local:4444/wd/hub',
|
||||
DesiredCapabilities::chrome()->setCapability(
|
||||
ChromeOptions::CAPABILITY,
|
||||
$options
|
||||
)
|
||||
);
|
||||
}
|
||||
|
@ -86,6 +88,7 @@ abstract class BrowserTestCase extends TestCase
|
|||
* Return an instance of the browser to be used for tests.
|
||||
*
|
||||
* @param \Facebook\WebDriver\Remote\RemoteWebDriver $driver
|
||||
*
|
||||
* @return \Pterodactyl\Tests\Browser\PterodactylBrowser
|
||||
*/
|
||||
protected function newBrowser($driver): PterodactylBrowser
|
||||
|
@ -109,9 +112,6 @@ abstract class BrowserTestCase extends TestCase
|
|||
|
||||
/**
|
||||
* Return a user model to authenticate aganist and use in the tests.
|
||||
*
|
||||
* @param array $attributes
|
||||
* @return \Pterodactyl\Models\User
|
||||
*/
|
||||
protected function user(array $attributes = []): User
|
||||
{
|
||||
|
|
|
@ -4,9 +4,6 @@ namespace Pterodactyl\Tests\Browser\Pages;
|
|||
|
||||
class LoginPage extends BasePage
|
||||
{
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function url(): string
|
||||
{
|
||||
return '/auth/login';
|
||||
|
|
|
@ -15,7 +15,7 @@ class ForgotPasswordProcessTest extends BrowserTestCase
|
|||
public function testResetPasswordWithInvalidAccount()
|
||||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->visit(new LoginPage)
|
||||
$browser->visit(new LoginPage())
|
||||
->assertSee(trans('auth.forgot_password.label'))
|
||||
->click('@forgotPassword')
|
||||
->waitForLocation('/auth/password')
|
||||
|
@ -39,7 +39,7 @@ class ForgotPasswordProcessTest extends BrowserTestCase
|
|||
public function testEmailCarryover()
|
||||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->visit(new LoginPage)
|
||||
$browser->visit(new LoginPage())
|
||||
->type('@username', 'dane@example.com')
|
||||
->click('@forgotPassword')
|
||||
->waitForLocation('/auth/password')
|
||||
|
|
|
@ -27,7 +27,7 @@ class LoginProcessTest extends BrowserTestCase
|
|||
public function testLoginUsingEmail()
|
||||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->visit(new LoginPage)
|
||||
$browser->visit(new LoginPage())
|
||||
->waitFor('@username')
|
||||
->type('@username', $this->user->email)
|
||||
->type('@password', self::$userPassword)
|
||||
|
@ -44,7 +44,7 @@ class LoginProcessTest extends BrowserTestCase
|
|||
public function testLoginUsingUsername()
|
||||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->visit(new LoginPage)
|
||||
$browser->visit(new LoginPage())
|
||||
->waitFor('@username')
|
||||
->type('@username', $this->user->username)
|
||||
->type('@password', self::$userPassword)
|
||||
|
|
|
@ -14,7 +14,7 @@ class AccountEmailProcessTest extends DashboardTestCase
|
|||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->loginAs($this->user)
|
||||
->visit(new AccountPage)
|
||||
->visit(new AccountPage())
|
||||
->assertValue('@email', $this->user->email)
|
||||
->type('@email', 'new.email@example.com')
|
||||
->type('@password', 'Password123')
|
||||
|
@ -34,7 +34,7 @@ class AccountEmailProcessTest extends DashboardTestCase
|
|||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->loginAs($this->user)
|
||||
->visit(new AccountPage)
|
||||
->visit(new AccountPage())
|
||||
->assertMissing('@email ~ .input-help.error')
|
||||
->type('@email', 'admin')
|
||||
->assertVisible('@email ~ .input-help.error')
|
||||
|
@ -51,7 +51,7 @@ class AccountEmailProcessTest extends DashboardTestCase
|
|||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->loginAs($this->user)
|
||||
->visit(new AccountPage)
|
||||
->visit(new AccountPage())
|
||||
->type('@email', 'new.email@example.com')
|
||||
->click('@submit')
|
||||
->assertFocused('@password')
|
||||
|
|
|
@ -14,7 +14,7 @@ class AccountPasswordProcessTest extends DashboardTestCase
|
|||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->loginAs($this->user)
|
||||
->visit(new AccountPage)
|
||||
->visit(new AccountPage())
|
||||
->type('@current_password', self::$userPassword)
|
||||
->assertMissing('@new_password ~ .input-help.error')
|
||||
->type('@new_password', 'test')
|
||||
|
@ -42,7 +42,7 @@ class AccountPasswordProcessTest extends DashboardTestCase
|
|||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->loginAs($this->user)
|
||||
->visit(new AccountPage)
|
||||
->visit(new AccountPage())
|
||||
->type('@current_password', 'badpassword')
|
||||
->type('@new_password', 'testtest')
|
||||
->type('@confirm_password', 'testtest')
|
||||
|
|
|
@ -17,7 +17,7 @@ class TwoFactorAuthenticationProcessTest extends DashboardTestCase
|
|||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->loginAs($this->user)
|
||||
->visit(new AccountPage)
|
||||
->visit(new AccountPage())
|
||||
->assertMissing('.modal-mask')
|
||||
->click('@2fa_button')
|
||||
->waitFor('@2fa_modal')
|
||||
|
@ -42,7 +42,7 @@ class TwoFactorAuthenticationProcessTest extends DashboardTestCase
|
|||
{
|
||||
$this->browse(function (PterodactylBrowser $browser) {
|
||||
$browser->loginAs($this->user)
|
||||
->visit(new AccountPage)
|
||||
->visit(new AccountPage())
|
||||
->click('@2fa_button')
|
||||
->waitForText(trans('dashboard/account.two_factor.setup.title'))
|
||||
->assertFocused('@2fa_token')
|
||||
|
@ -76,7 +76,7 @@ class TwoFactorAuthenticationProcessTest extends DashboardTestCase
|
|||
*/
|
||||
public function testTwoFactorCanBeDisabled()
|
||||
{
|
||||
$secret = (new Google2FA)->generateSecretKey(16);
|
||||
$secret = (new Google2FA())->generateSecretKey(16);
|
||||
|
||||
$this->user->update([
|
||||
'use_totp' => true,
|
||||
|
@ -85,7 +85,7 @@ class TwoFactorAuthenticationProcessTest extends DashboardTestCase
|
|||
|
||||
$this->browse(function (PterodactylBrowser $browser) use ($secret) {
|
||||
$browser->loginAs($this->user)
|
||||
->visit(new AccountPage)
|
||||
->visit(new AccountPage())
|
||||
->click('@2fa_button')
|
||||
->waitForText(trans('dashboard/account.two_factor.disable.title'))
|
||||
->click('@2fa_cancel')
|
||||
|
|
|
@ -11,8 +11,6 @@ class PterodactylBrowser extends Browser
|
|||
/**
|
||||
* Move the mouse to a specific location and then perform a left click action.
|
||||
*
|
||||
* @param int $x
|
||||
* @param int $y
|
||||
* @return $this
|
||||
*/
|
||||
public function clickPosition(int $x, int $y)
|
||||
|
@ -26,6 +24,7 @@ class PterodactylBrowser extends Browser
|
|||
* Perform a case insensitive search for a string in the body.
|
||||
*
|
||||
* @param string $text
|
||||
*
|
||||
* @return \Pterodactyl\Tests\Browser\PterodactylBrowser
|
||||
*/
|
||||
public function assertSee($text)
|
||||
|
@ -38,6 +37,7 @@ class PterodactylBrowser extends Browser
|
|||
*
|
||||
* @param string $selector
|
||||
* @param string $text
|
||||
*
|
||||
* @return \Pterodactyl\Tests\Browser\PterodactylBrowser
|
||||
*/
|
||||
public function assertSeeIn($selector, $text)
|
||||
|
|
|
@ -15,7 +15,9 @@ use Pterodactyl\Tests\Traits\Http\IntegrationJsonRequestAssertions;
|
|||
|
||||
abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
|
||||
{
|
||||
use CreatesTestModels, DatabaseTransactions, IntegrationJsonRequestAssertions;
|
||||
use CreatesTestModels;
|
||||
use DatabaseTransactions;
|
||||
use IntegrationJsonRequestAssertions;
|
||||
|
||||
/**
|
||||
* @var \Pterodactyl\Models\ApiKey
|
||||
|
@ -44,17 +46,11 @@ abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
|
|||
$this->withMiddleware('api..key:' . ApiKey::TYPE_APPLICATION);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \Pterodactyl\Models\User
|
||||
*/
|
||||
public function getApiUser(): User
|
||||
{
|
||||
return $this->user;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \Pterodactyl\Models\ApiKey
|
||||
*/
|
||||
public function getApiKey(): ApiKey
|
||||
{
|
||||
return $this->key;
|
||||
|
@ -62,10 +58,6 @@ abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
|
|||
|
||||
/**
|
||||
* Creates a new default API key and refreshes the headers using it.
|
||||
*
|
||||
* @param \Pterodactyl\Models\User $user
|
||||
* @param array $permissions
|
||||
* @return \Pterodactyl\Models\ApiKey
|
||||
*/
|
||||
protected function createNewDefaultApiKey(User $user, array $permissions = []): ApiKey
|
||||
{
|
||||
|
@ -77,8 +69,6 @@ abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
|
|||
|
||||
/**
|
||||
* Refresh the authorization header for a request to use a different API key.
|
||||
*
|
||||
* @param \Pterodactyl\Models\ApiKey $key
|
||||
*/
|
||||
protected function refreshHeaders(ApiKey $key)
|
||||
{
|
||||
|
@ -87,8 +77,6 @@ abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
|
|||
|
||||
/**
|
||||
* Create an administrative user.
|
||||
*
|
||||
* @return \Pterodactyl\Models\User
|
||||
*/
|
||||
protected function createApiUser(): User
|
||||
{
|
||||
|
@ -99,10 +87,6 @@ abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
|
|||
|
||||
/**
|
||||
* Create a new application API key for a given user model.
|
||||
*
|
||||
* @param \Pterodactyl\Models\User $user
|
||||
* @param array $permissions
|
||||
* @return \Pterodactyl\Models\ApiKey
|
||||
*/
|
||||
protected function createApiKey(User $user, array $permissions = []): ApiKey
|
||||
{
|
||||
|
@ -123,9 +107,6 @@ abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
|
|||
|
||||
/**
|
||||
* Return a transformer that can be used for testing purposes.
|
||||
*
|
||||
* @param string $abstract
|
||||
* @return \Pterodactyl\Transformers\Api\Application\BaseTransformer
|
||||
*/
|
||||
protected function getTransformer(string $abstract): BaseTransformer
|
||||
{
|
||||
|
|
|
@ -61,7 +61,9 @@ class EggControllerTest extends ApplicationApiIntegrationTestCase
|
|||
$expected = json_encode(Arr::sortRecursive($datum['attributes']));
|
||||
$actual = json_encode(Arr::sortRecursive($this->getTransformer(EggTransformer::class)->transform($egg)));
|
||||
|
||||
$this->assertSame($expected, $actual,
|
||||
$this->assertSame(
|
||||
$expected,
|
||||
$actual,
|
||||
'Unable to find JSON fragment: ' . PHP_EOL . PHP_EOL . "[{$expected}]" . PHP_EOL . PHP_EOL . 'within' . PHP_EOL . PHP_EOL . "[{$actual}]."
|
||||
);
|
||||
}
|
||||
|
|
|
@ -292,9 +292,6 @@ class UserControllerTest extends ApplicationApiIntegrationTestCase
|
|||
* Test that an API key without write permissions cannot create, update, or
|
||||
* delete a user model.
|
||||
*
|
||||
* @param string $method
|
||||
* @param string $url
|
||||
*
|
||||
* @dataProvider userWriteEndpointsDataProvider
|
||||
*/
|
||||
public function testApiKeyWithoutWritePermissions(string $method, string $url)
|
||||
|
@ -313,8 +310,6 @@ class UserControllerTest extends ApplicationApiIntegrationTestCase
|
|||
/**
|
||||
* Endpoints that should return a 403 error when the key does not have write
|
||||
* permissions for user management.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function userWriteEndpointsDataProvider(): array
|
||||
{
|
||||
|
|
|
@ -44,6 +44,7 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
|
|||
* to keep re-assigning variables.
|
||||
*
|
||||
* @param \Illuminate\Http\Response $response
|
||||
*
|
||||
* @return \Illuminate\Testing\TestResponse
|
||||
*/
|
||||
protected function createTestResponse($response)
|
||||
|
@ -54,10 +55,8 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
|
|||
/**
|
||||
* Returns a link to the specific resource using the client API.
|
||||
*
|
||||
* @param mixed $model
|
||||
* @param mixed $model
|
||||
* @param string|null $append
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function link($model, $append = null): string
|
||||
{
|
||||
|
@ -87,8 +86,6 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
|
|||
* is assumed that the user is actually a subuser of the server.
|
||||
*
|
||||
* @param string[] $permissions
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
protected function generateTestAccount(array $permissions = []): array
|
||||
{
|
||||
|
@ -115,7 +112,6 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
|
|||
* Asserts that the data passed through matches the output of the data from the transformer. This
|
||||
* will remove the "relationships" key when performing the comparison.
|
||||
*
|
||||
* @param array $data
|
||||
* @param \Pterodactyl\Models\Model|\Illuminate\Database\Eloquent\Model $model
|
||||
*/
|
||||
protected function assertJsonTransformedWith(array $data, $model)
|
||||
|
@ -123,7 +119,7 @@ abstract class ClientApiIntegrationTestCase extends IntegrationTestCase
|
|||
$reflect = new ReflectionClass($model);
|
||||
$transformer = sprintf('\\Pterodactyl\\Transformers\\Api\\Client\\%sTransformer', $reflect->getShortName());
|
||||
|
||||
$transformer = new $transformer;
|
||||
$transformer = new $transformer();
|
||||
$this->assertInstanceOf(BaseClientTransformer::class, $transformer);
|
||||
|
||||
$this->assertSame(
|
||||
|
|
|
@ -9,8 +9,6 @@ use Pterodactyl\Tests\Integration\Api\Client\ClientApiIntegrationTestCase;
|
|||
class AllocationAuthorizationTest extends ClientApiIntegrationTestCase
|
||||
{
|
||||
/**
|
||||
* @param string $method
|
||||
* @param string $endpoint
|
||||
* @dataProvider methodDataProvider
|
||||
*/
|
||||
public function testAccessToAServersAllocationsIsRestrictedProperly(string $method, string $endpoint)
|
||||
|
|
|
@ -24,7 +24,6 @@ class CreateNewAllocationTest extends ClientApiIntegrationTestCase
|
|||
/**
|
||||
* Tests that a new allocation can be properly assigned to a server.
|
||||
*
|
||||
* @param array $permission
|
||||
* @dataProvider permissionDataProvider
|
||||
*/
|
||||
public function testNewAllocationCanBeAssignedToServer(array $permission)
|
||||
|
|
|
@ -13,7 +13,6 @@ class DeleteAllocationTest extends ClientApiIntegrationTestCase
|
|||
* Test that an allocation is deleted from the server and the notes are properly reset
|
||||
* to an empty value on assignment.
|
||||
*
|
||||
* @param array $permission
|
||||
* @dataProvider permissionDataProvider
|
||||
*/
|
||||
public function testAllocationCanBeDeletedFromServer(array $permission)
|
||||
|
|
|
@ -12,8 +12,6 @@ use Pterodactyl\Tests\Integration\Api\Client\ClientApiIntegrationTestCase;
|
|||
class BackupAuthorizationTest extends ClientApiIntegrationTestCase
|
||||
{
|
||||
/**
|
||||
* @param string $method
|
||||
* @param string $endpoint
|
||||
* @dataProvider methodDataProvider
|
||||
*/
|
||||
public function testAccessToAServersBackupIsRestrictedProperly(string $method, string $endpoint)
|
||||
|
|
|
@ -69,7 +69,7 @@ class CommandControllerTest extends ClientApiIntegrationTestCase
|
|||
$this->repository->expects('setServer')->with(Mockery::on(function ($value) use ($server) {
|
||||
return $value->uuid === $server->uuid;
|
||||
}))->andReturnSelf();
|
||||
$this->repository->expects('send')->with('say Test')->andReturn(new GuzzleResponse);
|
||||
$this->repository->expects('send')->with('say Test')->andReturn(new GuzzleResponse());
|
||||
|
||||
$response = $this->actingAs($user)->postJson("/api/client/servers/{$server->uuid}/command", [
|
||||
'command' => 'say Test',
|
||||
|
|
|
@ -14,8 +14,6 @@ use Pterodactyl\Tests\Integration\Api\Client\ClientApiIntegrationTestCase;
|
|||
class DatabaseAuthorizationTest extends ClientApiIntegrationTestCase
|
||||
{
|
||||
/**
|
||||
* @param string $method
|
||||
* @param string $endpoint
|
||||
* @dataProvider methodDataProvider
|
||||
*/
|
||||
public function testAccessToAServersDatabasesIsRestrictedProperly(string $method, string $endpoint)
|
||||
|
|
|
@ -49,7 +49,6 @@ class NetworkAllocationControllerTest extends ClientApiIntegrationTestCase
|
|||
/**
|
||||
* Tests that notes on an allocation can be set correctly.
|
||||
*
|
||||
* @param array $permissions
|
||||
* @dataProvider updatePermissionsDataProvider
|
||||
*/
|
||||
public function testAllocationNotesCanBeUpdated(array $permissions)
|
||||
|
@ -98,7 +97,6 @@ class NetworkAllocationControllerTest extends ClientApiIntegrationTestCase
|
|||
}
|
||||
|
||||
/**
|
||||
* @param array $permissions
|
||||
* @dataProvider updatePermissionsDataProvider
|
||||
*/
|
||||
public function testPrimaryAllocationCanBeModified(array $permissions)
|
||||
|
|
|
@ -15,7 +15,6 @@ class PowerControllerTest extends ClientApiIntegrationTestCase
|
|||
* an error in response. This checks against the specific permission needed to send
|
||||
* the command to the server.
|
||||
*
|
||||
* @param string $action
|
||||
* @param string[] $permissions
|
||||
* @dataProvider invalidPermissionDataProvider
|
||||
*/
|
||||
|
@ -47,8 +46,6 @@ class PowerControllerTest extends ClientApiIntegrationTestCase
|
|||
/**
|
||||
* Test that sending a valid power actions works.
|
||||
*
|
||||
* @param string $action
|
||||
* @param string $permission
|
||||
* @dataProvider validPowerActionDataProvider
|
||||
*/
|
||||
public function testActionCanBeSentToServer(string $action, string $permission)
|
||||
|
@ -74,8 +71,6 @@ class PowerControllerTest extends ClientApiIntegrationTestCase
|
|||
|
||||
/**
|
||||
* Returns invalid permission combinations for a given power action.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function invalidPermissionDataProvider(): array
|
||||
{
|
||||
|
@ -88,9 +83,6 @@ class PowerControllerTest extends ClientApiIntegrationTestCase
|
|||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function validPowerActionDataProvider(): array
|
||||
{
|
||||
return [
|
||||
|
|
|
@ -90,9 +90,6 @@ class CreateServerScheduleTest extends ClientApiIntegrationTestCase
|
|||
->assertForbidden();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function permissionsDataProvider(): array
|
||||
{
|
||||
return [[[]], [[Permission::ACTION_SCHEDULE_CREATE]]];
|
||||
|
|
|
@ -78,9 +78,6 @@ class DeleteServerScheduleTest extends ClientApiIntegrationTestCase
|
|||
$this->assertDatabaseHas('schedules', ['id' => $schedule->id]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function permissionsDataProvider(): array
|
||||
{
|
||||
return [[[]], [[Permission::ACTION_SCHEDULE_DELETE]]];
|
||||
|
|
|
@ -15,7 +15,6 @@ class ExecuteScheduleTest extends ClientApiIntegrationTestCase
|
|||
/**
|
||||
* Test that a schedule can be executed and is updated in the database correctly.
|
||||
*
|
||||
* @param array $permissions
|
||||
* @dataProvider permissionsDataProvider
|
||||
*/
|
||||
public function testScheduleIsExecutedRightAway(array $permissions)
|
||||
|
@ -85,9 +84,6 @@ class ExecuteScheduleTest extends ClientApiIntegrationTestCase
|
|||
$this->actingAs($user)->postJson($this->link($schedule, '/execute'))->assertForbidden();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function permissionsDataProvider(): array
|
||||
{
|
||||
return [[[]], [[Permission::ACTION_SCHEDULE_UPDATE]]];
|
||||
|
|
|
@ -24,7 +24,7 @@ class GetServerSchedulesTest extends ClientApiIntegrationTestCase
|
|||
* Test that schedules for a server are returned.
|
||||
*
|
||||
* @param array $permissions
|
||||
* @param bool $individual
|
||||
* @param bool $individual
|
||||
* @dataProvider permissionsDataProvider
|
||||
*/
|
||||
public function testServerSchedulesAreReturned($permissions, $individual)
|
||||
|
@ -45,7 +45,7 @@ class GetServerSchedulesTest extends ClientApiIntegrationTestCase
|
|||
->assertOk();
|
||||
|
||||
$prefix = $individual ? '' : 'data.0.';
|
||||
if (! $individual) {
|
||||
if (!$individual) {
|
||||
$response->assertJsonCount(1, 'data');
|
||||
}
|
||||
|
||||
|
@ -91,9 +91,6 @@ class GetServerSchedulesTest extends ClientApiIntegrationTestCase
|
|||
->assertForbidden();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function permissionsDataProvider(): array
|
||||
{
|
||||
return [
|
||||
|
|
|
@ -17,8 +17,6 @@ class ScheduleAuthorizationTest extends ClientApiIntegrationTestCase
|
|||
* The comments within the test code itself are better at explaining exactly what is
|
||||
* being tested and protected against.
|
||||
*
|
||||
* @param string $method
|
||||
* @param string $endpoint
|
||||
* @dataProvider methodDataProvider
|
||||
*/
|
||||
public function testAccessToAServersSchedulesIsRestrictedProperly(string $method, string $endpoint)
|
||||
|
|
|
@ -112,9 +112,6 @@ class UpdateServerScheduleTest extends ClientApiIntegrationTestCase
|
|||
$this->assertFalse($schedule->is_processing);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function permissionsDataProvider(): array
|
||||
{
|
||||
return [[[]], [[Permission::ACTION_SCHEDULE_UPDATE]]];
|
||||
|
|
|
@ -167,9 +167,6 @@ class CreateServerScheduleTaskTest extends ClientApiIntegrationTestCase
|
|||
->assertForbidden();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function permissionsDataProvider(): array
|
||||
{
|
||||
return [[[]], [[Permission::ACTION_SCHEDULE_UPDATE]]];
|
||||
|
|
|
@ -110,17 +110,11 @@ class SettingsControllerTest extends ClientApiIntegrationTestCase
|
|||
$this->assertSame(Server::STATUS_INSTALLED, $server->installed);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function renamePermissionsDataProvider(): array
|
||||
{
|
||||
return [[[]], [[Permission::ACTION_SETTINGS_RENAME]]];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function reinstallPermissionsDataProvider(): array
|
||||
{
|
||||
return [[[]], [[Permission::ACTION_SETTINGS_REINSTALL]]];
|
||||
|
|
|
@ -49,7 +49,6 @@ class UpdateStartupVariableTest extends ClientApiIntegrationTestCase
|
|||
* Test that variables that are either not user_viewable, or not user_editable, cannot be
|
||||
* updated via this endpoint.
|
||||
*
|
||||
* @param array $permissions
|
||||
* @dataProvider permissionsDataProvider
|
||||
*/
|
||||
public function testStartupVariableCannotBeUpdatedIfNotUserViewableOrEditable(array $permissions)
|
||||
|
|
|
@ -156,9 +156,6 @@ class CreateServerSubuserTest extends ClientApiIntegrationTestCase
|
|||
$response->assertJsonPath('errors.0.detail', 'A user with that email address is already assigned as a subuser for this server.');
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function permissionsDataProvider(): array
|
||||
{
|
||||
return [[[]], [[Permission::ACTION_USER_CREATE]]];
|
||||
|
|
|
@ -13,7 +13,6 @@ class SubuserAuthorizationTest extends ClientApiIntegrationTestCase
|
|||
/**
|
||||
* Test that mismatched subusers are not accessible to a server.
|
||||
*
|
||||
* @param string $method
|
||||
* @dataProvider methodDataProvider
|
||||
*/
|
||||
public function testUserCannotAccessResourceBelongingToOtherServers(string $method)
|
||||
|
|
|
@ -50,8 +50,8 @@ class WebsocketControllerTest extends ClientApiIntegrationTestCase
|
|||
$this->assertStringStartsWith('wss://', $connection, 'Failed asserting that websocket connection address has expected "wss://" prefix.');
|
||||
$this->assertStringEndsWith("/api/servers/{$server->uuid}/ws", $connection, 'Failed asserting that websocket connection address uses expected Wings endpoint.');
|
||||
|
||||
$config = Configuration::forSymmetricSigner(new Sha256, $key = InMemory::plainText($server->node->getDecryptedKey()));
|
||||
$config->setValidationConstraints(new SignedWith(new Sha256, $key));
|
||||
$config = Configuration::forSymmetricSigner(new Sha256(), $key = InMemory::plainText($server->node->getDecryptedKey()));
|
||||
$config->setValidationConstraints(new SignedWith(new Sha256(), $key));
|
||||
/** @var \Lcobucci\JWT\Token\Plain $token */
|
||||
$token = $config->parser()->parse($response->json('data.token'));
|
||||
|
||||
|
@ -95,8 +95,8 @@ class WebsocketControllerTest extends ClientApiIntegrationTestCase
|
|||
$response->assertOk();
|
||||
$response->assertJsonStructure(['data' => ['token', 'socket']]);
|
||||
|
||||
$config = Configuration::forSymmetricSigner(new Sha256, $key = InMemory::plainText($server->node->getDecryptedKey()));
|
||||
$config->setValidationConstraints(new SignedWith(new Sha256, $key));
|
||||
$config = Configuration::forSymmetricSigner(new Sha256(), $key = InMemory::plainText($server->node->getDecryptedKey()));
|
||||
$config->setValidationConstraints(new SignedWith(new Sha256(), $key));
|
||||
/** @var \Lcobucci\JWT\Token\Plain $token */
|
||||
$token = $config->parser()->parse($response->json('data.token'));
|
||||
|
||||
|
|
|
@ -111,9 +111,7 @@ class TwoFactorControllerTest extends ClientApiIntegrationTestCase
|
|||
}
|
||||
}
|
||||
|
||||
throw new ExpectationFailedException(
|
||||
sprintf('Failed asserting that token [%s] exists as a hashed value in recovery_tokens table.', $raw)
|
||||
);
|
||||
throw new ExpectationFailedException(sprintf('Failed asserting that token [%s] exists as a hashed value in recovery_tokens table.', $raw));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -36,9 +36,6 @@ abstract class IntegrationTestCase extends TestCase
|
|||
|
||||
/**
|
||||
* Return an ISO-8601 formatted timestamp to use in the API response.
|
||||
*
|
||||
* @param string $timestamp
|
||||
* @return string
|
||||
*/
|
||||
protected function formatTimestamp(string $timestamp): string
|
||||
{
|
||||
|
|
|
@ -92,7 +92,7 @@ class FindAssignableAllocationServiceTest extends IntegrationTestCase
|
|||
config()->set('pterodactyl.client_features.allocations.range_start', 5000);
|
||||
config()->set('pterodactyl.client_features.allocations.range_end', 5005);
|
||||
|
||||
for ($i = 5000; $i <= 5005; $i++) {
|
||||
for ($i = 5000; $i <= 5005; ++$i) {
|
||||
Allocation::factory()->create([
|
||||
'ip' => $server->allocation->ip,
|
||||
'port' => $i,
|
||||
|
|
|
@ -184,9 +184,9 @@ class DatabaseManagementServiceTest extends IntegrationTestCase
|
|||
|
||||
$host = DatabaseHost::factory()->create(['node_id' => $server->node_id]);
|
||||
|
||||
$this->repository->expects('createDatabase')->with($name)->andThrows(new BadMethodCallException);
|
||||
$this->repository->expects('createDatabase')->with($name)->andThrows(new BadMethodCallException());
|
||||
$this->repository->expects('dropDatabase')->with($name);
|
||||
$this->repository->expects('dropUser')->withAnyArgs()->andThrows(new InvalidArgumentException);
|
||||
$this->repository->expects('dropUser')->withAnyArgs()->andThrows(new InvalidArgumentException());
|
||||
|
||||
$this->expectException(BadMethodCallException::class);
|
||||
|
||||
|
@ -199,9 +199,6 @@ class DatabaseManagementServiceTest extends IntegrationTestCase
|
|||
$this->assertDatabaseMissing('databases', ['server_id' => $server->id]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function invalidDataDataProvider(): array
|
||||
{
|
||||
return [
|
||||
|
|
|
@ -107,7 +107,7 @@ class DeployServerDatabaseServiceTest extends IntegrationTestCase
|
|||
'database_host_id' => $host->id,
|
||||
'database' => "s{$server->id}_something",
|
||||
'remote' => '%',
|
||||
])->andReturns(new Database);
|
||||
])->andReturns(new Database());
|
||||
|
||||
$response = $this->getService()->handle($server, [
|
||||
'database' => 'something',
|
||||
|
@ -133,7 +133,7 @@ class DeployServerDatabaseServiceTest extends IntegrationTestCase
|
|||
'database_host_id' => $host->id,
|
||||
'database' => "s{$server->id}_something",
|
||||
'remote' => '%',
|
||||
])->andReturns(new Database);
|
||||
])->andReturns(new Database());
|
||||
|
||||
$response = $this->getService()->handle($server, [
|
||||
'database' => 'something',
|
||||
|
@ -143,9 +143,6 @@ class DeployServerDatabaseServiceTest extends IntegrationTestCase
|
|||
$this->assertInstanceOf(Database::class, $response);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function invalidDataProvider(): array
|
||||
{
|
||||
return [
|
||||
|
|
|
@ -151,9 +151,6 @@ class ProcessScheduleServiceTest extends IntegrationTestCase
|
|||
$this->assertDatabaseHas('tasks', ['id' => $task->id, 'is_queued' => false]);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function dispatchNowDataProvider(): array
|
||||
{
|
||||
return [[true], [false]];
|
||||
|
|
|
@ -66,7 +66,7 @@ class ServerDeletionServiceTest extends IntegrationTestCase
|
|||
$this->expectException(DaemonConnectionException::class);
|
||||
|
||||
$this->daemonServerRepository->expects('setServer->delete')->withNoArgs()->andThrows(
|
||||
new DaemonConnectionException(new BadResponseException('Bad request', new Request('GET', '/test'), new Response))
|
||||
new DaemonConnectionException(new BadResponseException('Bad request', new Request('GET', '/test'), new Response()))
|
||||
);
|
||||
|
||||
$this->getService()->handle($server);
|
||||
|
@ -124,7 +124,7 @@ class ServerDeletionServiceTest extends IntegrationTestCase
|
|||
$this->daemonServerRepository->expects('setServer->delete')->withNoArgs()->andReturnUndefined();
|
||||
$this->databaseManagementService->expects('delete')->with(Mockery::on(function ($value) use ($db) {
|
||||
return $value instanceof Database && $value->id === $db->id;
|
||||
}))->andThrows(new Exception);
|
||||
}))->andThrows(new Exception());
|
||||
|
||||
$this->expectException(Exception::class);
|
||||
$this->getService()->handle($server);
|
||||
|
@ -149,7 +149,7 @@ class ServerDeletionServiceTest extends IntegrationTestCase
|
|||
$this->daemonServerRepository->expects('setServer->delete')->withNoArgs()->andReturnUndefined();
|
||||
$this->databaseManagementService->expects('delete')->with(Mockery::on(function ($value) use ($db) {
|
||||
return $value instanceof Database && $value->id === $db->id;
|
||||
}))->andThrows(new Exception);
|
||||
}))->andThrows(new Exception());
|
||||
|
||||
$this->getService()->withForce(true)->handle($server);
|
||||
|
||||
|
|
|
@ -15,6 +15,7 @@ class TestResponse extends IlluminateTestResponse
|
|||
* look for that status response.
|
||||
*
|
||||
* @param int $status
|
||||
*
|
||||
* @return \Pterodactyl\Tests\Integration\TestResponse
|
||||
*/
|
||||
public function assertStatus($status)
|
||||
|
@ -25,7 +26,7 @@ class TestResponse extends IlluminateTestResponse
|
|||
// to fail so that debugging isn't such a nightmare.
|
||||
if ($actual !== $status && $status !== 500) {
|
||||
$this->dump();
|
||||
if (! is_null($this->exception) && ! $this->exception instanceof DisplayException && ! $this->exception instanceof ValidationException) {
|
||||
if (!is_null($this->exception) && !$this->exception instanceof DisplayException && !$this->exception instanceof ValidationException) {
|
||||
dump($this->exception);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,8 +9,6 @@ trait IntegrationJsonRequestAssertions
|
|||
{
|
||||
/**
|
||||
* Make assertions about a 404 response on the API.
|
||||
*
|
||||
* @param \Illuminate\Testing\TestResponse $response
|
||||
*/
|
||||
public function assertNotFoundJson(TestResponse $response)
|
||||
{
|
||||
|
@ -30,8 +28,6 @@ trait IntegrationJsonRequestAssertions
|
|||
|
||||
/**
|
||||
* Make assertions about a 403 error returned by the API.
|
||||
*
|
||||
* @param \Illuminate\Testing\TestResponse $response
|
||||
*/
|
||||
public function assertAccessDeniedJson(TestResponse $response)
|
||||
{
|
||||
|
|
|
@ -22,8 +22,6 @@ trait RequestMockHelpers
|
|||
|
||||
/**
|
||||
* Set the class to mock for requests.
|
||||
*
|
||||
* @param string $class
|
||||
*/
|
||||
public function setRequestMockClass(string $class)
|
||||
{
|
||||
|
@ -34,8 +32,6 @@ trait RequestMockHelpers
|
|||
|
||||
/**
|
||||
* Configure the user model that the request mock should return with.
|
||||
*
|
||||
* @param \Pterodactyl\Models\User|null $user
|
||||
*/
|
||||
public function setRequestUserModel(User $user = null)
|
||||
{
|
||||
|
@ -44,9 +40,6 @@ trait RequestMockHelpers
|
|||
|
||||
/**
|
||||
* Generates a new request user model and also returns the generated model.
|
||||
*
|
||||
* @param array $args
|
||||
* @return \Pterodactyl\Models\User
|
||||
*/
|
||||
public function generateRequestUserModel(array $args = []): User
|
||||
{
|
||||
|
@ -59,8 +52,7 @@ trait RequestMockHelpers
|
|||
/**
|
||||
* Set a request attribute on the mock object.
|
||||
*
|
||||
* @param string $attribute
|
||||
* @param mixed $value
|
||||
* @param mixed $value
|
||||
*/
|
||||
public function setRequestAttribute(string $attribute, $value)
|
||||
{
|
||||
|
@ -69,8 +61,6 @@ trait RequestMockHelpers
|
|||
|
||||
/**
|
||||
* Set the request route name.
|
||||
*
|
||||
* @param string $name
|
||||
*/
|
||||
public function setRequestRouteName(string $name)
|
||||
{
|
||||
|
@ -83,7 +73,7 @@ trait RequestMockHelpers
|
|||
protected function buildRequestMock()
|
||||
{
|
||||
$this->request = m::mock($this->requestMockClass);
|
||||
if (! $this->request instanceof Request) {
|
||||
if (!$this->request instanceof Request) {
|
||||
throw new InvalidArgumentException('Request mock class must be an instance of ' . Request::class . ' when mocked.');
|
||||
}
|
||||
|
||||
|
@ -94,8 +84,6 @@ trait RequestMockHelpers
|
|||
* Sets the mocked request user. If a user model is not provided, a factory model
|
||||
* will be created and returned.
|
||||
*
|
||||
* @param \Pterodactyl\Models\User|null $user
|
||||
* @return \Pterodactyl\Models\User
|
||||
* @deprecated
|
||||
*/
|
||||
protected function setRequestUser(User $user = null): User
|
||||
|
|
|
@ -20,8 +20,6 @@ trait CreatesTestModels
|
|||
*
|
||||
* The returned server model will have all of the relationships loaded onto it.
|
||||
*
|
||||
* @param array $attributes
|
||||
*
|
||||
* @return \Pterodactyl\Models\Server
|
||||
*/
|
||||
public function createServerModel(array $attributes = [])
|
||||
|
@ -30,14 +28,14 @@ trait CreatesTestModels
|
|||
$attributes['owner_id'] = $attributes['user_id'];
|
||||
}
|
||||
|
||||
if (! isset($attributes['owner_id'])) {
|
||||
if (!isset($attributes['owner_id'])) {
|
||||
/** @var \Pterodactyl\Models\User $user */
|
||||
$user = User::factory()->create();
|
||||
$attributes['owner_id'] = $user->id;
|
||||
}
|
||||
|
||||
if (! isset($attributes['node_id'])) {
|
||||
if (! isset($attributes['location_id'])) {
|
||||
if (!isset($attributes['node_id'])) {
|
||||
if (!isset($attributes['location_id'])) {
|
||||
/** @var \Pterodactyl\Models\Location $location */
|
||||
$location = Location::factory()->create();
|
||||
$attributes['location_id'] = $location->id;
|
||||
|
@ -48,23 +46,23 @@ trait CreatesTestModels
|
|||
$attributes['node_id'] = $node->id;
|
||||
}
|
||||
|
||||
if (! isset($attributes['allocation_id'])) {
|
||||
if (!isset($attributes['allocation_id'])) {
|
||||
/** @var \Pterodactyl\Models\Allocation $allocation */
|
||||
$allocation = Allocation::factory()->create(['node_id' => $attributes['node_id']]);
|
||||
$attributes['allocation_id'] = $allocation->id;
|
||||
}
|
||||
|
||||
if (! isset($attributes['nest_id'])) {
|
||||
if (!isset($attributes['nest_id'])) {
|
||||
/** @var \Pterodactyl\Models\Nest $nest */
|
||||
$nest = Nest::with('eggs')->first();
|
||||
$attributes['nest_id'] = $nest->id;
|
||||
|
||||
if (! isset($attributes['egg_id'])) {
|
||||
if (!isset($attributes['egg_id'])) {
|
||||
$attributes['egg_id'] = $nest->getRelation('eggs')->first()->id;
|
||||
}
|
||||
}
|
||||
|
||||
if (! isset($attributes['egg_id'])) {
|
||||
if (!isset($attributes['egg_id'])) {
|
||||
/** @var \Pterodactyl\Models\Egg $egg */
|
||||
$egg = Egg::where('nest_id', $attributes['nest_id'])->first();
|
||||
$attributes['egg_id'] = $egg->id;
|
||||
|
@ -85,9 +83,6 @@ trait CreatesTestModels
|
|||
/**
|
||||
* Clones a given egg allowing us to make modifications that don't affect other
|
||||
* tests that rely on the egg existing in the correct state.
|
||||
*
|
||||
* @param \Pterodactyl\Models\Egg $egg
|
||||
* @return \Pterodactyl\Models\Egg
|
||||
*/
|
||||
protected function cloneEggAndVariables(Egg $egg): Egg
|
||||
{
|
||||
|
|
|
@ -41,7 +41,7 @@ trait MocksPdoConnection
|
|||
*/
|
||||
protected function tearDownPdoMock()
|
||||
{
|
||||
if (! self::$initialResolver) {
|
||||
if (!self::$initialResolver) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -22,8 +22,7 @@ trait MocksRequestException
|
|||
* Configure the exception mock to work with the Panel's default exception
|
||||
* handler actions.
|
||||
*
|
||||
* @param string $abstract
|
||||
* @param null $response
|
||||
* @param null $response
|
||||
*/
|
||||
protected function configureExceptionMock(string $abstract = RequestException::class, $response = null)
|
||||
{
|
||||
|
@ -32,9 +31,6 @@ trait MocksRequestException
|
|||
|
||||
/**
|
||||
* Return a mocked instance of the request exception.
|
||||
*
|
||||
* @param string $abstract
|
||||
* @return \Mockery\MockInterface
|
||||
*/
|
||||
protected function getExceptionMock(string $abstract = RequestException::class): MockInterface
|
||||
{
|
||||
|
|
|
@ -37,8 +37,6 @@ trait MocksUuids
|
|||
|
||||
/**
|
||||
* Returns the known UUID for tests to use.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getKnownUuid(): string
|
||||
{
|
||||
|
|
|
@ -48,8 +48,6 @@ class AdminAuthenticateTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware using mocked dependencies.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\AdminAuthenticate
|
||||
*/
|
||||
private function getMiddleware(): AdminAuthenticate
|
||||
{
|
||||
|
|
|
@ -44,11 +44,9 @@ class AuthenticateUserTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware for testing.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\Api\Application\AuthenticateApplicationUser
|
||||
*/
|
||||
private function getMiddleware(): AuthenticateApplicationUser
|
||||
{
|
||||
return new AuthenticateApplicationUser;
|
||||
return new AuthenticateApplicationUser();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -65,8 +65,6 @@ class AuthenticateIPAccessTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware to be used when testing.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\Api\AuthenticateIPAccess
|
||||
*/
|
||||
private function getMiddleware(): AuthenticateIPAccess
|
||||
{
|
||||
|
|
|
@ -68,7 +68,7 @@ class AuthenticateKeyTest extends MiddlewareTestCase
|
|||
$this->expectException(AccessDeniedHttpException::class);
|
||||
|
||||
$this->request->shouldReceive('bearerToken')->withNoArgs()->twice()->andReturn('abcd1234');
|
||||
$this->repository->shouldReceive('findFirstWhere')->andThrow(new RecordNotFoundException);
|
||||
$this->repository->shouldReceive('findFirstWhere')->andThrow(new RecordNotFoundException());
|
||||
|
||||
$this->getMiddleware()->handle($this->request, $this->getClosureAssertions(), ApiKey::TYPE_APPLICATION);
|
||||
}
|
||||
|
@ -160,8 +160,6 @@ class AuthenticateKeyTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware with mocked dependencies for testing.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\Api\AuthenticateKey
|
||||
*/
|
||||
private function getMiddleware(): AuthenticateKey
|
||||
{
|
||||
|
|
|
@ -70,7 +70,6 @@ class DaemonAuthenticateTest extends MiddlewareTestCase
|
|||
* Test that passing in an invalid node daemon secret will result in a bad request
|
||||
* exception being returned.
|
||||
*
|
||||
* @param string $token
|
||||
* @dataProvider badTokenDataProvider
|
||||
*/
|
||||
public function testResponseShouldFailIfTokenFormatIsIncorrect(string $token)
|
||||
|
@ -159,8 +158,6 @@ class DaemonAuthenticateTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware using mocked dependencies.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\Api\Daemon\DaemonAuthenticate
|
||||
*/
|
||||
private function getMiddleware(): DaemonAuthenticate
|
||||
{
|
||||
|
|
|
@ -36,8 +36,6 @@ class SetSessionDriverTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware with mocked dependencies for testing.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\Api\SetSessionDriver
|
||||
*/
|
||||
private function getMiddleware(): SetSessionDriver
|
||||
{
|
||||
|
|
|
@ -31,8 +31,6 @@ class AuthenticateTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware using mocked dependencies.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\Authenticate
|
||||
*/
|
||||
private function getMiddleware(): Authenticate
|
||||
{
|
||||
|
|
|
@ -50,8 +50,6 @@ class LanguageMiddlewareTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware using mocked dependencies.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\LanguageMiddleware
|
||||
*/
|
||||
private function getMiddleware(): LanguageMiddleware
|
||||
{
|
||||
|
|
|
@ -54,15 +54,12 @@ class MaintenanceMiddlewareTest extends MiddlewareTestCase
|
|||
$this->response->shouldReceive('view')
|
||||
->once()
|
||||
->with('errors.maintenance')
|
||||
->andReturn(new Response);
|
||||
->andReturn(new Response());
|
||||
|
||||
$response = $this->getMiddleware()->handle($this->request, $this->getClosureAssertions());
|
||||
$this->assertInstanceOf(Response::class, $response);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \Pterodactyl\Http\Middleware\MaintenanceMiddleware
|
||||
*/
|
||||
private function getMiddleware(): MaintenanceMiddleware
|
||||
{
|
||||
return new MaintenanceMiddleware($this->response);
|
||||
|
|
|
@ -9,7 +9,9 @@ use Pterodactyl\Tests\Assertions\MiddlewareAttributeAssertionsTrait;
|
|||
|
||||
abstract class MiddlewareTestCase extends TestCase
|
||||
{
|
||||
use MiddlewareAttributeAssertionsTrait, MocksMiddlewareClosure, RequestMockHelpers;
|
||||
use MiddlewareAttributeAssertionsTrait;
|
||||
use MocksMiddlewareClosure;
|
||||
use RequestMockHelpers;
|
||||
|
||||
/**
|
||||
* Setup tests with a mocked request object and normal attributes.
|
||||
|
|
|
@ -50,8 +50,6 @@ class RedirectIfAuthenticatedTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware using mocked dependencies.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\RedirectIfAuthenticated
|
||||
*/
|
||||
private function getMiddleware(): RedirectIfAuthenticated
|
||||
{
|
||||
|
|
|
@ -117,8 +117,6 @@ class AccessingValidServerTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Provide test data that checks that the correct view is returned for each model type.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function viewDataProvider(): array
|
||||
{
|
||||
|
@ -134,8 +132,6 @@ class AccessingValidServerTest extends MiddlewareTestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the middleware using mocked dependencies.
|
||||
*
|
||||
* @return \Pterodactyl\Http\Middleware\Server\AccessingValidServer
|
||||
*/
|
||||
private function getMiddleware(): AccessingValidServer
|
||||
{
|
||||
|
|
|
@ -12,7 +12,7 @@ class UsernameTest extends TestCase
|
|||
*/
|
||||
public function testRuleIsStringable()
|
||||
{
|
||||
$this->assertSame('p_username', (string) new Username);
|
||||
$this->assertSame('p_username', (string) new Username());
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -22,7 +22,7 @@ class UsernameTest extends TestCase
|
|||
*/
|
||||
public function testValidUsernames(string $username)
|
||||
{
|
||||
$this->assertTrue((new Username)->passes('test', $username), 'Assert username is valid.');
|
||||
$this->assertTrue((new Username())->passes('test', $username), 'Assert username is valid.');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -32,12 +32,11 @@ class UsernameTest extends TestCase
|
|||
*/
|
||||
public function testInvalidUsernames(string $username)
|
||||
{
|
||||
$this->assertFalse((new Username)->passes('test', $username), 'Assert username is not valid.');
|
||||
$this->assertFalse((new Username())->passes('test', $username), 'Assert username is not valid.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Provide valid usernames.
|
||||
* @return array
|
||||
*/
|
||||
public function validUsernameDataProvider(): array
|
||||
{
|
||||
|
@ -54,8 +53,6 @@ class UsernameTest extends TestCase
|
|||
|
||||
/**
|
||||
* Provide invalid usernames.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function invalidUsernameDataProvider(): array
|
||||
{
|
||||
|
|
|
@ -30,8 +30,6 @@ class AdminAclTest extends TestCase
|
|||
|
||||
/**
|
||||
* Provide valid and invalid permissions combos for testing.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function permissionsDataProvider(): array
|
||||
{
|
||||
|
|
|
@ -149,8 +149,6 @@ class KeyCreationServiceTest extends TestCase
|
|||
|
||||
/**
|
||||
* Provide key types that are not an application specific key.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function keyTypeDataProvider(): array
|
||||
{
|
||||
|
@ -161,8 +159,6 @@ class KeyCreationServiceTest extends TestCase
|
|||
|
||||
/**
|
||||
* Return an instance of the service with mocked dependencies for testing.
|
||||
*
|
||||
* @return \Pterodactyl\Services\Api\KeyCreationService
|
||||
*/
|
||||
private function getService(): KeyCreationService
|
||||
{
|
||||
|
|
Reference in a new issue