diff --git a/app/Fileshare/ConnectionTypes/ConnectionType.php b/app/Fileshare/ConnectionTypes/ConnectionType.php index 4536679d..514d5e74 100644 --- a/app/Fileshare/ConnectionTypes/ConnectionType.php +++ b/app/Fileshare/ConnectionTypes/ConnectionType.php @@ -41,7 +41,7 @@ abstract class ConnectionType extends Data { $filesystem = $this->getFilesystem(); - return $filesystem->directories($parent ?: '/'); + return collect($filesystem->directories($parent ?: '/'))->sort()->toArray(); } /** diff --git a/tests/Fileshare/FileshareFilesActionTest.php b/tests/Fileshare/FileshareFilesActionTest.php index 78dcf4b8..e5f3741c 100644 --- a/tests/Fileshare/FileshareFilesActionTest.php +++ b/tests/Fileshare/FileshareFilesActionTest.php @@ -22,11 +22,11 @@ class FileshareFilesActionTest extends FileshareTestCase 'parent' => null, ]) ->assertJsonCount(2, 'data') - ->assertJsonPath('data.0.name', 'pictures') - ->assertJsonPath('data.0.path', '/pictures') + ->assertJsonPath('data.0.name', 'lala') + ->assertJsonPath('data.0.path', '/lala') ->assertJsonPath('data.0.parent', '/') - ->assertJsonPath('data.1.name', 'lala') - ->assertJsonPath('data.1.path', '/lala') + ->assertJsonPath('data.1.name', 'pictures') + ->assertJsonPath('data.1.path', '/pictures') ->assertJsonPath('data.1.parent', '/'); } @@ -92,11 +92,11 @@ class FileshareFilesActionTest extends FileshareTestCase 'parent' => null, ]) ->assertJsonCount(2, 'data') - ->assertJsonPath('data.0.name', 'pictures') - ->assertJsonPath('data.0.path', '/pictures') + ->assertJsonPath('data.0.name', 'lala') + ->assertJsonPath('data.0.path', '/lala') ->assertJsonPath('data.0.parent', '/') - ->assertJsonPath('data.1.name', 'lala') - ->assertJsonPath('data.1.path', '/lala') + ->assertJsonPath('data.1.name', 'pictures') + ->assertJsonPath('data.1.path', '/pictures') ->assertJsonPath('data.1.parent', '/'); }