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

Refactor obscure service names to be clearer

Browse source
This commit is contained in:
Dane Everitt 2017-08-27 15:10:51 -05:00
parent a91d84ecfe
commit 67ac36f5ce
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
25 changed files with 96 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/Unit/Services/Nodes/CreationServiceTest.php → tests/Unit/Services/Nodes/NodeCreationServiceTest.php
View file

@ -27,10 +27,10 @@ namespace Tests\Unit\Services\Nodes;
use Mockery as m;
use Tests\TestCase;
use phpmock\phpunit\PHPMock;
use Pterodactyl\Services\Nodes\CreationService;
use Pterodactyl\Services\Nodes\NodeCreationService;
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
class CreationServiceTest extends TestCase
class NodeCreationServiceTest extends TestCase
{
use PHPMock;
@ -40,7 +40,7 @@ class CreationServiceTest extends TestCase
protected $repository;
/**
* @var \Pterodactyl\Services\Nodes\CreationService
* @var \Pterodactyl\Services\Nodes\NodeCreationService
*/
protected $service;
@ -53,7 +53,7 @@ class CreationServiceTest extends TestCase
$this->repository = m::mock(NodeRepositoryInterface::class);
$this->service = new CreationService($this->repository);
$this->service = new NodeCreationService($this->repository);
}
/**

8
tests/Unit/Services/Nodes/DeletionServiceTest.php → tests/Unit/Services/Nodes/NodeDeletionServiceTest.php
View file

@ -27,12 +27,12 @@ namespace Tests\Unit\Services\Nodes;
use Mockery as m;
use Tests\TestCase;
use Pterodactyl\Models\Node;
use Pterodactyl\Services\Nodes\DeletionService;
use Pterodactyl\Services\Nodes\NodeDeletionService;
use Illuminate\Contracts\Translation\Translator;
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
class DeletionServiceTest extends TestCase
class NodeDeletionServiceTest extends TestCase
{
/**
* @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
@ -50,7 +50,7 @@ class DeletionServiceTest extends TestCase
protected $translator;
/**
* @var \Pterodactyl\Services\Nodes\DeletionService
* @var \Pterodactyl\Services\Nodes\NodeDeletionService
*/
protected $service;
@ -65,7 +65,7 @@ class DeletionServiceTest extends TestCase
$this->serverRepository = m::mock(ServerRepositoryInterface::class);
$this->translator = m::mock(Translator::class);
$this->service = new DeletionService(
$this->service = new NodeDeletionService(
$this->repository,
$this->serverRepository,
$this->translator

12
tests/Unit/Services/Nodes/UpdateServiceTest.php → tests/Unit/Services/Nodes/NodeUpdateServiceTest.php
View file

@ -32,12 +32,12 @@ use phpmock\phpunit\PHPMock;
use Pterodactyl\Models\Node;
use GuzzleHttp\Exception\RequestException;
use Pterodactyl\Exceptions\DisplayException;
use Pterodactyl\Services\Nodes\UpdateService;
use Pterodactyl\Services\Nodes\CreationService;
use Pterodactyl\Services\Nodes\NodeUpdateService;
use Pterodactyl\Services\Nodes\NodeCreationService;
use Pterodactyl\Contracts\Repository\NodeRepositoryInterface;
use Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface;
class UpdateServiceTest extends TestCase
class NodeUpdateServiceTest extends TestCase
{
use PHPMock;
@ -62,7 +62,7 @@ class UpdateServiceTest extends TestCase
protected $repository;
/**
* @var \Pterodactyl\Services\Nodes\UpdateService
* @var \Pterodactyl\Services\Nodes\NodeUpdateService
*/
protected $service;
@ -85,7 +85,7 @@ class UpdateServiceTest extends TestCase
$this->repository = m::mock(NodeRepositoryInterface::class);
$this->writer = m::mock(Writer::class);
$this->service = new UpdateService(
$this->service = new NodeUpdateService(
$this->configRepository,
$this->repository,
$this->writer
@ -99,7 +99,7 @@ class UpdateServiceTest extends TestCase
{
$this->getFunctionMock('\\Pterodactyl\\Services\\Nodes', 'random_bytes')
->expects($this->once())->willReturnCallback(function ($bytes) {
$this->assertEquals(CreationService::DAEMON_SECRET_LENGTH, $bytes);
$this->assertEquals(NodeCreationService::DAEMON_SECRET_LENGTH, $bytes);
return '\00';
});