Finalize tests

Author: DaneEveritt

CHANGELOG.md

@@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 * New CLI command to disabled 2-Factor Authentication on an account if necessary.
 * Ability to delete users and locations via the CLI.
 * You can now require 2FA for all users, admins only, or at will using a simple configuration in the Admin CP.
+* Added ability to export and import service options and their associated settings and environment variables via the Admin CP.
 
 ### Changed
 * Theme colors and login pages updated to give a more unique feel to the project.

app/Services/Services/Options/InstallScriptUpdateService.php

@@ -40,7 +40,7 @@ public function __construct(ServiceOptionRepositoryInterface $repository)
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\InvalidCopyFromException
      */
-    public function handle($option, array $data): void
+    public function handle($option, array $data)
     {
         if (! $option instanceof ServiceOption) {
             $option = $this->repository->find($option);

app/Services/Services/Options/OptionUpdateService.php

@@ -40,7 +40,7 @@ public function __construct(ServiceOptionRepositoryInterface $repository)
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      * @throws \Pterodactyl\Exceptions\Service\ServiceOption\NoParentConfigurationFoundException
      */
-    public function handle($option, array $data): void
+    public function handle($option, array $data)
     {
         if (! $option instanceof ServiceOption) {
             $option = $this->repository->find($option);

app/Services/Services/ServiceUpdateService.php

@@ -36,7 +36,7 @@ public function __construct(ServiceRepositoryInterface $repository)
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function handle(int $service, array $data): void
+    public function handle(int $service, array $data)
     {
         if (! is_null(array_get($data, 'author'))) {
             unset($data['author']);

tests/Unit/Services/Services/Options/OptionCreationServiceTest.php

@@ -60,14 +60,16 @@ public function setUp()
      */
     public function testCreateNewModelWithoutUsingConfigFrom()
     {
-        $model = factory(ServiceOption::class)->make();
+        $model = factory(ServiceOption::class)->make([
+            'tag' => str_random(10),
+        ]);
 
         $this->config->shouldReceive('get')->with('pterodactyl.service.author')->once()->andReturn('test@example.com');
         $this->uuid->shouldReceive('uuid4->toString')->withNoArgs()->once()->andReturn('uuid-string');
         $this->repository->shouldReceive('create')->with([
             'name' => $model->name,
-            'config_from' => null,
             'tag' => 'test@example.com:' . $model->tag,
+            'config_from' => null,
             'uuid' => 'uuid-string',
         ], true, true)->once()->andReturn($model);
 

tests/Unit/Services/Services/Sharing/ServiceOptionExporterServiceTest.php

@@ -51,6 +51,9 @@ public function setUp()
         $this->service = new ServiceOptionExporterService($this->carbon, $this->repository);
     }
 
+    /**
+     * Test that a JSON structure is returned.
+     */
     public function testJsonStructureIsExported()
     {
         $option = factory(ServiceOption::class)->make();