StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Browse source
This commit is contained in:
Dane Everitt 2017-09-02 00:21:17 -05:00
commit 4203cdcb77
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
21 changed files with 50 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/Unit/Http/Controllers/Base/AccountControllerTest.php
View file

@ -25,12 +25,12 @@
namespace Tests\Unit\Http\Controllers\Base;
use Mockery as m;
use Tests\TestCase;
use Prologue\Alerts\AlertsMessageBag;
use Tests\Assertions\ControllerAssertionsTrait;
use Pterodactyl\Services\Users\UserUpdateService;
use Pterodactyl\Http\Controllers\Base\AccountController;
use Pterodactyl\Http\Requests\Base\AccountDataFormRequest;
use Pterodactyl\Services\Users\UserUpdateService;
use Tests\Assertions\ControllerAssertionsTrait;
use Tests\TestCase;
class AccountControllerTest extends TestCase
{

2
tests/Unit/Services/Api/KeyCreationServiceTest.php
View file

@ -27,10 +27,10 @@ namespace Tests\Unit\Services\Api;
use Mockery as m;
use Tests\TestCase;
use phpmock\phpunit\PHPMock;
use Pterodactyl\Services\Api\KeyCreationService;
use Illuminate\Database\ConnectionInterface;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Services\Api\PermissionService;
use Pterodactyl\Services\Api\KeyCreationService;
use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
class KeyCreationServiceTest extends TestCase

2
tests/Unit/Services/Nodes/NodeDeletionServiceTest.php
View file

@ -27,8 +27,8 @@ namespace Tests\Unit\Services\Nodes;
use Mockery as m;
use Tests\TestCase;
use Pterodactyl\Models\Node;
use Pterodactyl\Services\Nodes\NodeDeletionService;
use Illuminate\Contracts\Translation\Translator;
use Pterodactyl\Services\Nodes\NodeDeletionService;
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;

8
tests/Unit/Services/Users/ToggleTwoFactorServiceTest.php
View file

@ -25,11 +25,11 @@
namespace Tests\Unit\Services\Users;
use Mockery as m;
use PragmaRX\Google2FA\Contracts\Google2FA;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
use Pterodactyl\Models\User;
use Pterodactyl\Services\Users\ToggleTwoFactorService;
use Tests\TestCase;
use Pterodactyl\Models\User;
use PragmaRX\Google2FA\Contracts\Google2FA;
use Pterodactyl\Services\Users\ToggleTwoFactorService;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
class ToggleTwoFactorServiceTest extends TestCase
{

10
tests/Unit/Services/Users/TwoFactorSetupServiceTest.php
View file

@ -24,13 +24,13 @@
namespace Tests\Unit\Services\Users;
use Illuminate\Contracts\Config\Repository;
use Mockery as m;
use PragmaRX\Google2FA\Contracts\Google2FA;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
use Pterodactyl\Models\User;
use Pterodactyl\Services\Users\TwoFactorSetupService;
use Tests\TestCase;
use Pterodactyl\Models\User;
use Illuminate\Contracts\Config\Repository;
use PragmaRX\Google2FA\Contracts\Google2FA;
use Pterodactyl\Services\Users\TwoFactorSetupService;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
class TwoFactorSetupServiceTest extends TestCase
{

2
tests/Unit/Services/Users/UserDeletionServiceTest.php
View file

@ -27,8 +27,8 @@ namespace Tests\Unit\Services\Users;
use Mockery as m;
use Tests\TestCase;
use Pterodactyl\Models\User;
use Pterodactyl\Services\Users\UserDeletionService;
use Illuminate\Contracts\Translation\Translator;
use Pterodactyl\Services\Users\UserDeletionService;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;