Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions osfs/os_rootfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
package osfs

import (
"cmp"
"errors"
"fmt"
gofs "io/fs"
"os"
"path/filepath"
"slices"
"strings"

"github.com/go-git/go-billy/v6"
Expand Down Expand Up @@ -142,6 +144,9 @@ func (fs *RootOS) ReadDir(name string) ([]gofs.DirEntry, error) {
if err != nil {
return nil, translateError(err, rel)
}
slices.SortFunc(e, func(a, b gofs.DirEntry) int {
return cmp.Compare(a.Name(), b.Name())
})
return e, nil
}

Expand Down
27 changes: 27 additions & 0 deletions osfs/os_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,33 @@ import (
"testing"
)

func TestReadDirFilesystem(t *testing.T) {
fs := New(t.TempDir())

for _, name := range []string{"file1.txt", "file3.txt", "file2.txt"} {
f, err := fs.Create(name)
if err != nil {
t.Fatal(err)
}
f.Close()
}

entries, err := fs.ReadDir(".")
if err != nil {
t.Fatal(err)
}
if len(entries) != 3 {
t.Fatalf("expected 3 entries, got %d", len(entries))
}

want := []string{"file1.txt", "file2.txt", "file3.txt"}
for i, e := range entries {
if e.Name() != want[i] {
t.Fatalf("expected %s at index %d, got %s", want[i], i, e.Name())
}
}
}

var _ fs.File = &file{}

func TestDefault(t *testing.T) {
Expand Down