From 344b4e7d6074ea3fee9cce88a250981582b1feb3 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 16 Jan 2025 09:46:03 -0800 Subject: [PATCH] fixes test to check if checked in licenses is unavailable --- .../Licenses/LicenseCheckinController.php | 3 ++- database/factories/LicenseSeatFactory.php | 1 + tests/Feature/Checkins/Ui/LicenseCheckinTest.php | 12 +++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/Licenses/LicenseCheckinController.php b/app/Http/Controllers/Licenses/LicenseCheckinController.php index 1581fc1419..07b063af5e 100644 --- a/app/Http/Controllers/Licenses/LicenseCheckinController.php +++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php @@ -95,9 +95,10 @@ class LicenseCheckinController extends Controller $licenseSeat->assigned_to = null; $licenseSeat->asset_id = null; $licenseSeat->notes = $request->input('notes'); - if (! $license->reassignable) { + if (! $licenseSeat->license->reassignable) { $licenseSeat->unavailable = 1; $licenseSeat->notes .= "\n" . trans('admin/licenses/message.checkin.not_reassignable') . '.'; + } session()->put(['redirect_option' => $request->get('redirect_option')]); diff --git a/database/factories/LicenseSeatFactory.php b/database/factories/LicenseSeatFactory.php index aaf75bdc2d..2aa1c55f37 100644 --- a/database/factories/LicenseSeatFactory.php +++ b/database/factories/LicenseSeatFactory.php @@ -14,6 +14,7 @@ class LicenseSeatFactory extends Factory { return [ 'license_id' => License::factory(), + 'unavailable' => 0, ]; } diff --git a/tests/Feature/Checkins/Ui/LicenseCheckinTest.php b/tests/Feature/Checkins/Ui/LicenseCheckinTest.php index 7a6553d8ba..093455c5e7 100644 --- a/tests/Feature/Checkins/Ui/LicenseCheckinTest.php +++ b/tests/Feature/Checkins/Ui/LicenseCheckinTest.php @@ -20,7 +20,7 @@ class LicenseCheckinTest extends TestCase ->assertForbidden(); } - public function testCannotCheckinNonReassignableLicense() + public function testNonReassignableLicenseSeatIsUnavailable() { $licenseSeat = LicenseSeat::factory() ->notReassignable() @@ -28,13 +28,11 @@ class LicenseCheckinTest extends TestCase ->create(); $this->actingAs(User::factory()->checkoutLicenses()->create()) - ->post(route('licenses.checkin.save', $licenseSeat), [ - 'notes' => 'my note', - 'redirect_option' => 'index', - ]) - ->assertSessionHas('error', trans('admin/licenses/message.checkin.not_reassignable') . '.'); + ->post(route('licenses.checkin.save', $licenseSeat)); - $this->assertNotNull($licenseSeat->fresh()->assigned_to); + $licenseSeat->refresh(); + + $this->assertEquals(1, $licenseSeat->unavailable); } public function testCannotCheckinLicenseThatIsNotAssigned()