More test suite coverage

Author: DaneEveritt

app/Jobs/Schedule/RunTaskJob.php

@@ -40,7 +40,7 @@ class RunTaskJob extends Job implements ShouldQueue
     /**
      * @var int
      */
-    protected $schedule;
+    public $schedule;
 
     /**
      * @var int

app/Services/DaemonKeys/DaemonKeyProviderService.php

@@ -83,7 +83,7 @@ public function handle($server, $user, $updateIfExpired = true)
             ['server_id', '=', $server],
         ]);
 
-        if (! $updateIfExpired || max($this->carbon->now()->diffInSeconds($key->expires_at, false), 0) > 0) {
+        if (! $updateIfExpired || $this->carbon->now()->diffInSeconds($key->expires_at, false) > 0) {
             return $key->secret;
         }
 

app/Services/Helpers/TemporaryPasswordService.php

@@ -10,22 +10,22 @@
 namespace Pterodactyl\Services\Helpers;
 
 use Illuminate\Contracts\Hashing\Hasher;
-use Illuminate\Database\DatabaseManager;
-use Illuminate\Config\Repository as ConfigRepository;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
 class TemporaryPasswordService
 {
     const HMAC_ALGO = 'sha256';
 
     /**
-     * @var \Illuminate\Config\Repository
+     * @var \Illuminate\Contracts\Config\Repository
      */
     protected $config;
 
     /**
-     * @var \Illuminate\Database\DatabaseManager
+     * @var \Illuminate\Database\ConnectionInterface
      */
-    protected $database;
+    protected $connection;
 
     /**
      * @var \Illuminate\Contracts\Hashing\Hasher
@@ -35,17 +35,17 @@ class TemporaryPasswordService
     /**
      * TemporaryPasswordService constructor.
      *
-     * @param \Illuminate\Config\Repository        $config
-     * @param \Illuminate\Database\DatabaseManager $database
-     * @param \Illuminate\Contracts\Hashing\Hasher $hasher
+     * @param \Illuminate\Contracts\Config\Repository  $config
+     * @param \Illuminate\Database\ConnectionInterface $connection
+     * @param \Illuminate\Contracts\Hashing\Hasher     $hasher
      */
     public function __construct(
         ConfigRepository $config,
-        DatabaseManager $database,
+        ConnectionInterface $connection,
         Hasher $hasher
     ) {
         $this->config = $config;
-        $this->database = $database;
+        $this->connection = $connection;
         $this->hasher = $hasher;
     }
 
@@ -55,11 +55,11 @@ public function __construct(
      * @param string $email
      * @return string
      */
-    public function generateReset($email)
+    public function handle($email)
     {
         $token = hash_hmac(self::HMAC_ALGO, str_random(40), $this->config->get('app.key'));
 
-        $this->database->table('password_resets')->insert([
+        $this->connection->table('password_resets')->insert([
             'email' => $email,
             'token' => $this->hasher->make($token),
         ]);

app/Services/Schedules/ProcessScheduleService.php

@@ -17,14 +17,24 @@
 
 class ProcessScheduleService
 {
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface
+     */
     protected $repository;
 
+    /**
+     * @var \Pterodactyl\Services\Schedules\Tasks\RunTaskService
+     */
     protected $runnerService;
 
-    public function __construct(
-        RunTaskService $runnerService,
-        ScheduleRepositoryInterface $repository
-    ) {
+    /**
+     * ProcessScheduleService constructor.
+     *
+     * @param \Pterodactyl\Services\Schedules\Tasks\RunTaskService          $runnerService
+     * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository
+     */
+    public function __construct(RunTaskService $runnerService, ScheduleRepositoryInterface $repository)
+    {
         $this->repository = $repository;
         $this->runnerService = $runnerService;
     }

app/Services/Schedules/Tasks/RunTaskService.php

@@ -10,16 +10,13 @@
 namespace Pterodactyl\Services\Schedules\Tasks;
 
 use Pterodactyl\Models\Task;
-use Illuminate\Contracts\Bus\Dispatcher;
 use Pterodactyl\Jobs\Schedule\RunTaskJob;
+use Illuminate\Foundation\Bus\DispatchesJobs;
 use Pterodactyl\Contracts\Repository\TaskRepositoryInterface;
 
 class RunTaskService
 {
-    /**
-     * @var \Illuminate\Contracts\Bus\Dispatcher
-     */
-    protected $dispatcher;
+    use DispatchesJobs;
 
     /**
      * @var \Pterodactyl\Contracts\Repository\TaskRepositoryInterface
@@ -29,14 +26,10 @@ class RunTaskService
     /**
      * RunTaskService constructor.
      *
-     * @param \Illuminate\Contracts\Bus\Dispatcher                      $dispatcher
      * @param \Pterodactyl\Contracts\Repository\TaskRepositoryInterface $repository
      */
-    public function __construct(
-        Dispatcher $dispatcher,
-        TaskRepositoryInterface $repository
-    ) {
-        $this->dispatcher = $dispatcher;
+    public function __construct(TaskRepositoryInterface $repository)
+    {
         $this->repository = $repository;
     }
 
@@ -55,6 +48,6 @@ public function handle($task)
         }
 
         $this->repository->update($task->id, ['is_queued' => true]);
-        $this->dispatcher->dispatch((new RunTaskJob($task->id, $task->schedule_id))->delay($task->time_offset));
+        $this->dispatch((new RunTaskJob($task->id, $task->schedule_id))->delay($task->time_offset));
     }
 }

app/Services/Users/UserCreationService.php

@@ -93,7 +93,7 @@ public function handle(array $data)
         $this->connection->beginTransaction();
         if (! isset($data['password']) || empty($data['password'])) {
             $data['password'] = $this->hasher->make(str_random(30));
-            $token = $this->passwordService->generateReset($data['email']);
+            $token = $this->passwordService->handle($data['email']);
         }
 
         $user = $this->repository->create($data);

database/factories/ModelFactory.php

@@ -202,5 +202,6 @@
         'server_id' => $faker->randomNumber(),
         'user_id' => $faker->randomNumber(),
         'secret' => 'i_' . str_random(40),
+        'expires_at' => \Carbon\Carbon::now()->addMinutes(10)->toDateTimeString(),
     ];
 });

tests/Unit/Services/DaemonKeys/DaemonKeyProviderServiceTest.php

@@ -46,7 +46,9 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->carbon = m::mock(Carbon::class);
+        $this->carbon = new Carbon();
+        $this->carbon->setTestNow();
+
         $this->keyUpdateService = m::mock(DaemonKeyUpdateService::class);
         $this->repository = m::mock(DaemonKeyRepositoryInterface::class);
 
@@ -65,9 +67,6 @@ public function testKeyIsReturned()
             ['server_id', '=', $key->server_id],
         ])->once()->andReturn($key);
 
-        $this->carbon->shouldReceive('now')->withNoArgs()->once()->andReturnSelf();
-        $this->carbon->shouldReceive('diffInSeconds')->with($key->expires_at, false)->once()->andReturn(100);
-
         $response = $this->service->handle($key->server_id, $key->user_id);
         $this->assertNotEmpty($response);
         $this->assertEquals($key->secret, $response);
@@ -78,16 +77,15 @@ public function testKeyIsReturned()
      */
     public function testExpiredKeyIsUpdated()
     {
-        $key = factory(DaemonKey::class)->make();
+        $key = factory(DaemonKey::class)->make([
+            'expires_at' => $this->carbon->subHour(),
+        ]);
 
         $this->repository->shouldReceive('findFirstWhere')->with([
             ['user_id', '=', $key->user_id],
             ['server_id', '=', $key->server_id],
         ])->once()->andReturn($key);
 
-        $this->carbon->shouldReceive('now')->withNoArgs()->once()->andReturnSelf();
-        $this->carbon->shouldReceive('diffInSeconds')->with($key->expires_at, false)->once()->andReturn(-100);
-
         $this->keyUpdateService->shouldReceive('handle')->with($key->id)->once()->andReturn(true);
 
         $response = $this->service->handle($key->server_id, $key->user_id);
@@ -100,7 +98,9 @@ public function testExpiredKeyIsUpdated()
      */
     public function testExpiredKeyIsNotUpdated()
     {
-        $key = factory(DaemonKey::class)->make();
+        $key = factory(DaemonKey::class)->make([
+            'expires_at' => $this->carbon->subHour(),
+        ]);
 
         $this->repository->shouldReceive('findFirstWhere')->with([
             ['user_id', '=', $key->user_id],

tests/Unit/Services/Helpers/TemporaryPasswordServiceTest.php

@@ -0,0 +1,80 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Tests\Unit\Services\Helpers;
+
+use Mockery as m;
+use Tests\TestCase;
+use phpmock\phpunit\PHPMock;
+use Illuminate\Contracts\Hashing\Hasher;
+use Illuminate\Contracts\Config\Repository;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Services\Helpers\TemporaryPasswordService;
+
+class TemporaryPasswordServiceTest extends TestCase
+{
+    use PHPMock;
+
+    /**
+     * @var \Illuminate\Contracts\Config\Repository|\Mockery\Mock
+     */
+    protected $config;
+
+    /**
+     * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
+     */
+    protected $connection;
+
+    /**
+     * @var \Illuminate\Contracts\Hashing\Hasher|\Mockery\Mock
+     */
+    protected $hasher;
+
+    /**
+     * @var \Pterodactyl\Services\Helpers\TemporaryPasswordService
+     */
+    protected $service;
+
+    /**
+     * Setup tests.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->config = m::mock(Repository::class);
+        $this->connection = m::mock(ConnectionInterface::class);
+        $this->hasher = m::mock(Hasher::class);
+
+        $this->service = new TemporaryPasswordService($this->config, $this->connection, $this->hasher);
+    }
+
+    /**
+     * Test that a temporary password is stored and the token is returned.
+     */
+    public function testTemporaryPasswordIsStored()
+    {
+        $this->getFunctionMock('\\Pterodactyl\\Services\\Helpers', 'str_random')
+            ->expects($this->once())->with(40)->willReturn('random_string');
+
+        $this->config->shouldReceive('get')->with('app.key')->once()->andReturn('123456');
+        $token = hash_hmac(TemporaryPasswordService::HMAC_ALGO, 'random_string', '123456');
+
+        $this->hasher->shouldReceive('make')->with($token)->once()->andReturn('hashed_token');
+        $this->connection->shouldReceive('table')->with('password_resets')->once()->andReturnSelf();
+        $this->connection->shouldReceive('insert')->with([
+            'email' => 'test@example.com',
+            'token' => 'hashed_token',
+        ])->once()->andReturnNull();
+
+        $response = $this->service->handle('test@example.com');
+        $this->assertNotEmpty($response);
+        $this->assertEquals($token, $response);
+    }
+}