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

Add database management back to front-end and begin some refactoring

Browse source 
Here we go again boys...
This commit is contained in:
Dane Everitt 2017-10-18 22:32:19 -05:00
parent 2b80de03df
commit 97dc0519d6
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
32 changed files with 774 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/Unit/Http/Controllers/Admin/DatabaseControllerTest.php
View file

@ -13,7 +13,6 @@ use Mockery as m;
use Tests\TestCase;
use Prologue\Alerts\AlertsMessageBag;
use Tests\Assertions\ControllerAssertionsTrait;
use Pterodactyl\Services\Database\DatabaseHostService;
use Pterodactyl\Http\Controllers\Admin\DatabaseController;
use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
@ -43,7 +42,7 @@ class DatabaseControllerTest extends TestCase
protected $repository;
/**
* @var \Pterodactyl\Services\Database\DatabaseHostService
* @var \Pterodactyl\Services\Databases\HostsUpdateService
*/
protected $service;
@ -57,7 +56,7 @@ class DatabaseControllerTest extends TestCase
$this->alert = m::mock(AlertsMessageBag::class);
$this->locationRepository = m::mock(LocationRepositoryInterface::class);
$this->repository = m::mock(DatabaseHostRepositoryInterface::class);
$this->service = m::mock(DatabaseHostService::class);
$this->service = m::mock(HostUpdateService::class);
$this->controller = new DatabaseController(
$this->alert,

5
tests/Unit/Services/Database/DatabaseHostServiceTest.php
View file

@ -15,7 +15,6 @@ use Illuminate\Database\DatabaseManager;
use Pterodactyl\Exceptions\DisplayException;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Extensions\DynamicDatabaseConnection;
use Pterodactyl\Services\Database\DatabaseHostService;
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
@ -47,7 +46,7 @@ class DatabaseHostServiceTest extends TestCase
protected $repository;
/**
* @var \Pterodactyl\Services\Database\DatabaseHostService
* @var \Pterodactyl\Services\Databases\HostsUpdateService
*/
protected $service;
@ -64,7 +63,7 @@ class DatabaseHostServiceTest extends TestCase
$this->encrypter = m::mock(Encrypter::class);
$this->repository = m::mock(DatabaseHostRepositoryInterface::class);
$this->service = new DatabaseHostService(
$this->service = new HostUpdateService(
$this->database,
$this->databaseRepository,
$this->repository,

4
tests/Unit/Services/Database/DatabaseManagementServiceTest.php
View file

@ -16,7 +16,7 @@ use phpmock\phpunit\PHPMock;
use Illuminate\Database\DatabaseManager;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Extensions\DynamicDatabaseConnection;
use Pterodactyl\Services\Database\DatabaseManagementService;
use Pterodactyl\Services\Databases\DatabaseManagementService;
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
class DatabaseManagementServiceTest extends TestCase
@ -53,7 +53,7 @@ class DatabaseManagementServiceTest extends TestCase
protected $repository;
/**
* @var \Pterodactyl\Services\Database\DatabaseManagementService
* @var \Pterodactyl\Services\Databases\DatabaseManagementService
*/
protected $service;

4
tests/Unit/Services/Servers/ServerDeletionServiceTest.php
View file

@ -18,7 +18,7 @@ use GuzzleHttp\Exception\RequestException;
use Illuminate\Database\ConnectionInterface;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Services\Servers\ServerDeletionService;
use Pterodactyl\Services\Database\DatabaseManagementService;
use Pterodactyl\Services\Databases\DatabaseManagementService;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
use Pterodactyl\Contracts\Repository\DatabaseRepositoryInterface;
use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
@ -36,7 +36,7 @@ class ServerDeletionServiceTest extends TestCase
protected $daemonServerRepository;
/**
* @var \Pterodactyl\Services\Database\DatabaseManagementService
* @var \Pterodactyl\Services\Databases\DatabaseManagementService
*/
protected $databaseManagementService;