@@ -89,7 +89,7 @@ class Folder extends Model
|
|||||||
{
|
{
|
||||||
$folders = Folder::query()
|
$folders = Folder::query()
|
||||||
->forUser($user)
|
->forUser($user)
|
||||||
->orderBy('id')
|
->orderBy('name')
|
||||||
->get()
|
->get()
|
||||||
->keyBy('id');
|
->keyBy('id');
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,20 @@ test('authenticated users can visit the folders page', function () {
|
|||||||
$response->assertOk();
|
$response->assertOk();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('folders are returned in alphabetical order, including nested folders', function () {
|
||||||
|
$user = User::factory()->create();
|
||||||
|
$work = Folder::factory()->for($user)->create(['name' => 'Work']);
|
||||||
|
Folder::factory()->for($user)->create(['name' => 'Health']);
|
||||||
|
Folder::factory()->for($user)->create(['name' => 'Personal']);
|
||||||
|
Folder::factory()->childOf($work)->create(['name' => 'Zebra']);
|
||||||
|
Folder::factory()->childOf($work)->create(['name' => 'Acme']);
|
||||||
|
|
||||||
|
$tree = Folder::treeForUser($user);
|
||||||
|
|
||||||
|
expect($tree->pluck('path')->all())
|
||||||
|
->toBe(['Health', 'Personal', 'Work', 'Work / Acme', 'Work / Zebra']);
|
||||||
|
});
|
||||||
|
|
||||||
test('users can create a top-level folder', function () {
|
test('users can create a top-level folder', function () {
|
||||||
$user = User::factory()->create();
|
$user = User::factory()->create();
|
||||||
$this->actingAs($user);
|
$this->actingAs($user);
|
||||||
|
|||||||
Reference in New Issue
Block a user