FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Nabeel Shahzad
2022-02-04 15:03:05 -05:00
parent 670cb5d811
commit e4782c40f3
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/RegistrationTest.php
View File

@@ -5,6 +5,7 @@ namespace Tests;
use App\Events\UserRegistered; use App\Events\UserRegistered;
use App\Models\Enums\UserState; use App\Models\Enums\UserState;
use App\Models\User; use App\Models\User;
use App\Services\UserService;
use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
@@ -23,11 +24,12 @@ class RegistrationTest extends TestCase
Event::fake(); Event::fake();
Notification::fake(); Notification::fake();
$userSvc = app('App\Services\UserService'); /** @var UserService $userSvc */
$userSvc = app(UserService::class);
setting('pilots.auto_accept', true); setting('pilots.auto_accept', true);
$attrs = factory(User::class)->make()->toArray(); $attrs = factory(User::class)->make()->makeVisible(['api_key', 'name', 'email'])->toArray();
$attrs['password'] = Hash::make('secret'); $attrs['password'] = Hash::make('secret');
$user = $userSvc->createUser($attrs); $user = $userSvc->createUser($attrs);

12
tests/UserTest.php
View File

@@ -291,13 +291,13 @@ class UserTest extends TestCase
*/ */
public function testUserPilotIdAdded() public function testUserPilotIdAdded()
{ {
$new_user = factory(User::class)->make()->toArray(); $new_user = factory(User::class)->make()->makeVisible(['api_key', 'name', 'email'])->toArray();
$new_user['password'] = Hash::make('secret'); $new_user['password'] = Hash::make('secret');
$user = $this->userSvc->createUser($new_user); $user = $this->userSvc->createUser($new_user);
$this->assertEquals($user->id, $user->pilot_id); $this->assertEquals($user->id, $user->pilot_id);
// Add a second user // Add a second user
$new_user = factory(User::class)->make()->toArray(); $new_user = factory(User::class)->make()->makeVisible(['api_key', 'name', 'email'])->toArray();
$new_user['password'] = Hash::make('secret'); $new_user['password'] = Hash::make('secret');
$user2 = $this->userSvc->createUser($new_user); $user2 = $this->userSvc->createUser($new_user);
$this->assertEquals($user2->id, $user2->pilot_id); $this->assertEquals($user2->id, $user2->pilot_id);
@@ -313,11 +313,11 @@ class UserTest extends TestCase
public function testUserPilotDeleted() public function testUserPilotDeleted()
{ {
$new_user = factory(User::class)->make()->toArray(); $new_user = factory(User::class)->make()->makeVisible(['api_key', 'name', 'email'])->toArray();
$new_user['password'] = Hash::make('secret'); $new_user['password'] = Hash::make('secret');
$admin_user = $this->userSvc->createUser($new_user); $admin_user = $this->userSvc->createUser($new_user);
$new_user = factory(User::class)->make()->toArray(); $new_user = factory(User::class)->make()->makeVisible(['api_key', 'name', 'email'])->toArray();
$new_user['password'] = Hash::make('secret'); $new_user['password'] = Hash::make('secret');
$user = $this->userSvc->createUser($new_user); $user = $this->userSvc->createUser($new_user);
$this->assertEquals($user->id, $user->pilot_id); $this->assertEquals($user->id, $user->pilot_id);
@@ -335,11 +335,11 @@ class UserTest extends TestCase
public function testUserPilotDeletedWithPireps() public function testUserPilotDeletedWithPireps()
{ {
$new_user = factory(User::class)->make()->toArray(); $new_user = factory(User::class)->make()->makeVisible(['api_key', 'name', 'email'])->toArray();
$new_user['password'] = Hash::make('secret'); $new_user['password'] = Hash::make('secret');
$admin_user = $this->userSvc->createUser($new_user); $admin_user = $this->userSvc->createUser($new_user);
$new_user = factory(User::class)->make()->toArray(); $new_user = factory(User::class)->make()->makeVisible(['api_key', 'name', 'email'])->toArray();
$new_user['password'] = Hash::make('secret'); $new_user['password'] = Hash::make('secret');
$user = $this->userSvc->createUser($new_user); $user = $this->userSvc->createUser($new_user);
$this->assertEquals($user->id, $user->pilot_id); $this->assertEquals($user->id, $user->pilot_id);