DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-08-21 10:13:57 +01:00
parent 973e2e5756 d0acf5b8a6
commit d3f30ced94
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Location.php
View file

@ -33,7 +33,7 @@ class Location extends SnipeModel
'country' => 'min:2|max:191|nullable', 'country' => 'min:2|max:191|nullable',
'zip' => 'max:10|nullable', 'zip' => 'max:10|nullable',
'manager_id' => 'exists:users,id|nullable', 'manager_id' => 'exists:users,id|nullable',
'parent_id' => 'non_circular:locations,id', 'parent_id' => 'nullable|exists:locations,id|non_circular:locations,id',
]; ];
protected $casts = [ protected $casts = [

16
tests/Feature/Locations/Ui/CreateLocationsTest.php
View file

@ -32,6 +32,20 @@ class CreateLocationsTest extends TestCase
$this->assertTrue(Location::where('name', 'Test Location')->exists()); $this->assertTrue(Location::where('name', 'Test Location')->exists());
} }
public function testUserCannotCreateLocationsWithInvalidParent()
{
$this->assertFalse(Location::where('name', 'Test Location')->exists());
$this->actingAs(User::factory()->superuser()->create())
->from(route('locations.create'))
->post(route('locations.store'), [
'name' => 'Test Location',
'parent_id' => '100000000'
])
->assertRedirect(route('locations.create'));
$this->assertFalse(Location::where('name', 'Test Location')->exists());
}
} }

15
tests/Feature/Locations/Ui/UpdateLocationsTest.php
View file

@ -52,6 +52,21 @@ class UpdateLocationsTest extends TestCase
$this->assertFalse(Location::where('name', 'Test Location')->exists()); $this->assertFalse(Location::where('name', 'Test Location')->exists());
} }
public function testUserCannotEditLocationsWithInvalidParent()
{
$location = Location::factory()->create();
$response = $this->actingAs(User::factory()->superuser()->create())
->from(route('locations.edit', ['location' => $location->id]))
->put(route('locations.update', ['location' => $location]), [
'name' => 'Test Location',
'parent_id' => '100000000'
])
->assertRedirect(route('locations.edit', ['location' => $location->id]));
$this->followRedirects($response)->assertSee(trans('general.error'));
$this->assertFalse(Location::where('name', 'Test Location')->exists());
}
} }