Check for airline being active; fix tests for L7 #718
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
<?php
|
||||
|
||||
namespace Tests;
|
||||
|
||||
use App\Exceptions\PilotIdNotFound;
|
||||
use App\Exceptions\UserPilotIdExists;
|
||||
use App\Models\User;
|
||||
@@ -35,7 +37,7 @@ class UserTest extends TestCase
|
||||
|
||||
$rank = $this->createRank(10, [$subfleetA['subfleet']->id]);
|
||||
|
||||
$user = factory(App\Models\User::class)->create([
|
||||
$user = factory(\App\Models\User::class)->create([
|
||||
'rank_id' => $rank->id,
|
||||
]);
|
||||
|
||||
@@ -95,7 +97,7 @@ class UserTest extends TestCase
|
||||
|
||||
$rank = $this->createRank(10, [$subfleetA['subfleet']->id]);
|
||||
|
||||
$user = factory(App\Models\User::class)->create([
|
||||
$user = factory(\App\Models\User::class)->create([
|
||||
'rank_id' => $rank->id,
|
||||
]);
|
||||
|
||||
@@ -136,17 +138,17 @@ class UserTest extends TestCase
|
||||
{
|
||||
// Add subfleets and aircraft, but also add another
|
||||
// set of subfleets
|
||||
$airport = factory(App\Models\Airport::class)->create();
|
||||
$airport = factory(\App\Models\Airport::class)->create();
|
||||
$subfleetA = $this->createSubfleetWithAircraft(2, $airport->id);
|
||||
$subfleetB = $this->createSubfleetWithAircraft(2);
|
||||
|
||||
$rank = $this->createRank(10, [$subfleetA['subfleet']->id]);
|
||||
$user = factory(App\Models\User::class)->create([
|
||||
$user = factory(\App\Models\User::class)->create([
|
||||
'curr_airport_id' => $airport->id,
|
||||
'rank_id' => $rank->id,
|
||||
]);
|
||||
|
||||
$flight = factory(App\Models\Flight::class)->create([
|
||||
$flight = factory(\App\Models\Flight::class)->create([
|
||||
'airline_id' => $user->airline_id,
|
||||
'dpt_airport_id' => $airport->id,
|
||||
]);
|
||||
@@ -201,8 +203,8 @@ class UserTest extends TestCase
|
||||
public function testUserPilotIdChangeAlreadyExists()
|
||||
{
|
||||
$this->expectException(UserPilotIdExists::class);
|
||||
$user1 = factory(App\Models\User::class)->create(['id' => 1]);
|
||||
$user2 = factory(App\Models\User::class)->create(['id' => 2]);
|
||||
$user1 = factory(\App\Models\User::class)->create(['id' => 1]);
|
||||
$user2 = factory(\App\Models\User::class)->create(['id' => 2]);
|
||||
|
||||
// Now try to change the original user's pilot_id to 2 (should conflict)
|
||||
$this->userSvc->changePilotId($user1, 2);
|
||||
@@ -214,7 +216,7 @@ class UserTest extends TestCase
|
||||
public function testUserPilotIdSplit(): void
|
||||
{
|
||||
/** @var \App\Models\User $user */
|
||||
$user = factory(App\Models\User::class)->create();
|
||||
$user = factory(\App\Models\User::class)->create();
|
||||
$found_user = $this->userSvc->findUserByPilotId($user->ident);
|
||||
$this->assertEquals($user->id, $found_user->id);
|
||||
|
||||
@@ -229,7 +231,7 @@ class UserTest extends TestCase
|
||||
public function testUserPilotIdSplitInvalidId(): void
|
||||
{
|
||||
/** @var \App\Models\User $user */
|
||||
$user = factory(App\Models\User::class)->create();
|
||||
$user = factory(\App\Models\User::class)->create();
|
||||
|
||||
$this->expectException(PilotIdNotFound::class);
|
||||
$this->userSvc->findUserByPilotId($user->airline->iata);
|
||||
@@ -240,13 +242,13 @@ class UserTest extends TestCase
|
||||
*/
|
||||
public function testUserPilotIdAdded()
|
||||
{
|
||||
$new_user = factory(App\Models\User::class)->make()->toArray();
|
||||
$new_user = factory(\App\Models\User::class)->make()->toArray();
|
||||
$new_user['password'] = Hash::make('secret');
|
||||
$user = $this->userSvc->createUser($new_user);
|
||||
$this->assertEquals($user->id, $user->pilot_id);
|
||||
|
||||
// Add a second user
|
||||
$new_user = factory(App\Models\User::class)->make()->toArray();
|
||||
$new_user = factory(\App\Models\User::class)->make()->toArray();
|
||||
$new_user['password'] = Hash::make('secret');
|
||||
$user2 = $this->userSvc->createUser($new_user);
|
||||
$this->assertEquals($user2->id, $user2->pilot_id);
|
||||
@@ -256,7 +258,7 @@ class UserTest extends TestCase
|
||||
$this->assertEquals(3, $user->pilot_id);
|
||||
|
||||
// Create a new user and the pilot_id should be 4
|
||||
$user3 = factory(App\Models\User::class)->create();
|
||||
$user3 = factory(\App\Models\User::class)->create();
|
||||
$this->assertEquals(4, $user3->pilot_id);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user