Fix all currently failing tests

tests/Unit/Services/Subusers/SubuserUpdateServiceTest.php

@@ -32,8 +32,10 @@ use Pterodactyl\Models\Subuser;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Exceptions\DisplayException;
+use Pterodactyl\Exceptions\PterodactylException;
 use Pterodactyl\Services\Subusers\SubuserUpdateService;
 use Pterodactyl\Services\Subusers\PermissionCreationService;
+use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
 use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
 use Pterodactyl\Contracts\Repository\PermissionRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
@@ -41,32 +43,37 @@ use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonS
 class SubuserUpdateServiceTest extends TestCase
 {
     /**
-     * @var \Illuminate\Database\ConnectionInterface
+     * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
      */
     protected $connection;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface|\Mockery\Mock
      */
     protected $daemonRepository;
 
     /**
-     * @var \GuzzleHttp\Exception\RequestException
+     * @var \GuzzleHttp\Exception\RequestException|\Mockery\Mock
      */
     protected $exception;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface
+     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService|\Mockery\Mock
+     */
+    private $keyProviderService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\PermissionRepositoryInterface|\Mockery\Mock
      */
     protected $permissionRepository;
 
     /**
-     * @var \Pterodactyl\Services\Subusers\PermissionCreationService
+     * @var \Pterodactyl\Services\Subusers\PermissionCreationService|\Mockery\Mock
      */
     protected $permissionService;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
@@ -76,7 +83,7 @@ class SubuserUpdateServiceTest extends TestCase
     protected $service;
 
     /**
-     * @var \Illuminate\Log\Writer
+     * @var \Illuminate\Log\Writer|\Mockery\Mock
      */
     protected $writer;
 
@@ -90,6 +97,7 @@ class SubuserUpdateServiceTest extends TestCase
         $this->connection = m::mock(ConnectionInterface::class);
         $this->daemonRepository = m::mock(DaemonServerRepositoryInterface::class);
         $this->exception = m::mock(RequestException::class);
+        $this->keyProviderService = m::mock(DaemonKeyProviderService::class);
         $this->permissionRepository = m::mock(PermissionRepositoryInterface::class);
         $this->permissionService = m::mock(PermissionCreationService::class);
         $this->repository = m::mock(SubuserRepositoryInterface::class);
@@ -97,6 +105,7 @@ class SubuserUpdateServiceTest extends TestCase
 
         $this->service = new SubuserUpdateService(
             $this->connection,
+            $this->keyProviderService,
             $this->daemonRepository,
             $this->permissionService,
             $this->permissionRepository,
@@ -115,18 +124,19 @@ class SubuserUpdateServiceTest extends TestCase
 
         $this->repository->shouldReceive('getWithServer')->with($subuser->id)->once()->andReturn($subuser);
         $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->permissionRepository->shouldReceive('deleteWhere')->with([
-            ['subuser_id', '=', $subuser->id],
-        ])->once()->andReturnNull();
-        $this->permissionService->shouldReceive('handle')->with($subuser->id, ['some-permission'])->once()->andReturn(['test:1', 'test:2']);
+        $this->permissionRepository->shouldReceive('deleteWhere')->with([['subuser_id', '=', $subuser->id]])
+            ->once()->andReturnNull();
+        $this->permissionService->shouldReceive('handle')->with($subuser->id, ['some-permission'])->once()->andReturnNull();
 
+        $this->keyProviderService->shouldReceive('handle')->with($subuser->server_id, $subuser->user_id, false)
+            ->once()->andReturn('test123');
         $this->daemonRepository->shouldReceive('setNode')->with($subuser->server->node_id)->once()->andReturnSelf()
-            ->shouldReceive('setAccessServer')->with($subuser->server->uuid)->once()->andReturnSelf()
-            ->shouldReceive('setSubuserKey')->with($subuser->daemonSecret, ['test:1', 'test:2'])->once()->andReturnNull();
+            ->shouldReceive('revokeAccessKey')->with('test123')->once()->andReturnNull();
 
         $this->connection->shouldReceive('commit')->withNoArgs()->once()->andReturnNull();
 
         $this->service->handle($subuser->id, ['some-permission']);
+        $this->assertTrue(true);
     }
 
     /**
@@ -139,11 +149,12 @@ class SubuserUpdateServiceTest extends TestCase
 
         $this->repository->shouldReceive('getWithServer')->with($subuser->id)->once()->andReturn($subuser);
         $this->connection->shouldReceive('beginTransaction')->withNoArgs()->once()->andReturnNull();
-        $this->permissionRepository->shouldReceive('deleteWhere')->with([
-            ['subuser_id', '=', $subuser->id],
-        ])->once()->andReturnNull();
-        $this->permissionService->shouldReceive('handle')->with($subuser->id, [])->once()->andReturn([]);
+        $this->permissionRepository->shouldReceive('deleteWhere')->with([['subuser_id', '=', $subuser->id]])
+            ->once()->andReturnNull();
+        $this->permissionService->shouldReceive('handle')->with($subuser->id, [])->once()->andReturnNull();
 
+        $this->keyProviderService->shouldReceive('handle')->with($subuser->server_id, $subuser->user_id, false)
+            ->once()->andReturn('test123');
         $this->daemonRepository->shouldReceive('setNode')->once()->andThrow($this->exception);
         $this->connection->shouldReceive('rollBack')->withNoArgs()->once()->andReturnNull();
         $this->writer->shouldReceive('warning')->with($this->exception)->once()->andReturnNull();
@@ -151,8 +162,11 @@ class SubuserUpdateServiceTest extends TestCase
 
         try {
             $this->service->handle($subuser->id, []);
-        } catch (DisplayException $exception) {
-            $this->assertEquals(trans('exceptions.daemon_connection_failed', ['code' => 'E_CONN_REFUSED']), $exception->getMessage());
+        } catch (PterodactylException $exception) {
+            $this->assertInstanceOf(DisplayException::class, $exception);
+            $this->assertEquals(trans('exceptions.daemon_connection_failed', [
+                'code' => 'E_CONN_REFUSED',
+            ]), $exception->getMessage());
         }
     }
 }