MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-18 14:23:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dane Everitt
2017-09-04 14:34:40 -05:00
parent b12f6f1156 aebb7c66fd
commit 7222754580
12 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Unit/Http/Controllers/Server/Files/DownloadControllerTest.php
View File

@@ -25,14 +25,14 @@
namespace Tests\Unit\Http\Controllers\Server\Files;
use Mockery as m;
use Illuminate\Cache\Repository;
use Illuminate\Contracts\Session\Session;
use Tests\TestCase;
use phpmock\phpunit\PHPMock;
use Pterodactyl\Http\Controllers\Server\Files\DownloadController;
use Pterodactyl\Models\Node;
use Pterodactyl\Models\Server;
use Illuminate\Cache\Repository;
use Illuminate\Contracts\Session\Session;
use Tests\Assertions\ControllerAssertionsTrait;
use Tests\TestCase;
use Pterodactyl\Http\Controllers\Server\Files\DownloadController;
class DownloadControllerTest extends TestCase
{

20
tests/Unit/Http/Controllers/Server/Files/FileActionsControllerTest.php
View File

@@ -24,18 +24,18 @@
namespace Tests\Unit\Http\Controllers\Server\Files;
use GuzzleHttp\Exception\RequestException;
use Illuminate\Contracts\Session\Session;
use Illuminate\Http\Request;
use Illuminate\Log\Writer;
use Mockery as m;
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Http\Controllers\Server\Files\FileActionsController;
use Pterodactyl\Http\Requests\Server\UpdateFileContentsFormRequest;
use Pterodactyl\Models\Server;
use Tests\Assertions\ControllerAssertionsTrait;
use Tests\TestCase;
use Illuminate\Log\Writer;
use Illuminate\Http\Request;
use Pterodactyl\Models\Server;
use Illuminate\Contracts\Session\Session;
use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Exceptions\DisplayException;
use Tests\Assertions\ControllerAssertionsTrait;
use Pterodactyl\Http\Requests\Server\UpdateFileContentsFormRequest;
use Pterodactyl\Contracts\Repository\Daemon\FileRepositoryInterface;
use Pterodactyl\Http\Controllers\Server\Files\FileActionsController;
class FileActionsControllerTest extends TestCase
{