diff --git a/app/Models/Folder.php b/app/Models/Folder.php index 9f10953..b1737ef 100644 --- a/app/Models/Folder.php +++ b/app/Models/Folder.php @@ -89,7 +89,7 @@ class Folder extends Model { $folders = Folder::query() ->forUser($user) - ->orderBy('id') + ->orderBy('name') ->get() ->keyBy('id'); diff --git a/tests/Feature/FoldersTest.php b/tests/Feature/FoldersTest.php index 5f1cd6a..dff39a0 100644 --- a/tests/Feature/FoldersTest.php +++ b/tests/Feature/FoldersTest.php @@ -20,6 +20,20 @@ test('authenticated users can visit the folders page', function () { $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 () { $user = User::factory()->create(); $this->actingAs($user);