From fa879e157608a891733179460d702503f188b589 Mon Sep 17 00:00:00 2001 From: Deluan Date: Sun, 26 Jul 2026 22:25:52 -0400 Subject: [PATCH] refactor(artwork): move fakeFolderRepo to artwork_suite_test.go Signed-off-by: Deluan --- core/artwork/artwork_suite_test.go | 21 +++++++++++++++++++++ core/artwork/testhelpers_test.go | 25 ------------------------- 2 files changed, 21 insertions(+), 25 deletions(-) delete mode 100644 core/artwork/testhelpers_test.go diff --git a/core/artwork/artwork_suite_test.go b/core/artwork/artwork_suite_test.go index ffb7d1148..b3a76a768 100644 --- a/core/artwork/artwork_suite_test.go +++ b/core/artwork/artwork_suite_test.go @@ -11,6 +11,7 @@ import ( "github.com/navidrome/navidrome/core/storage" "github.com/navidrome/navidrome/log" + "github.com/navidrome/navidrome/model" "github.com/navidrome/navidrome/model/metadata" "github.com/navidrome/navidrome/tests" . "github.com/onsi/ginkgo/v2" @@ -81,3 +82,23 @@ func (s *osDirStorage) FS() (storage.MusicFS, error) { } return osDirFS{os.DirFS(s.root)}, nil } + +// fakeFolderRepo covers the three FolderRepository methods the resolvers reach for; only the +// folder listing varies per spec, so the other two answer as an unremarkable library does. +type fakeFolderRepo struct { + model.FolderRepository + result []model.Folder + err error +} + +func (f *fakeFolderRepo) GetAll(...model.QueryOptions) ([]model.Folder, error) { + return f.result, f.err +} + +func (f *fakeFolderRepo) HasAudioOutsideFolders(model.Folder, []string) (bool, error) { + return false, nil +} + +func (f *fakeFolderRepo) Get(string) (*model.Folder, error) { + return nil, model.ErrNotFound +} diff --git a/core/artwork/testhelpers_test.go b/core/artwork/testhelpers_test.go deleted file mode 100644 index 2d1a3f3d3..000000000 --- a/core/artwork/testhelpers_test.go +++ /dev/null @@ -1,25 +0,0 @@ -package artwork - -import ( - "github.com/navidrome/navidrome/model" -) - -// fakeFolderRepo covers the three FolderRepository methods the resolvers reach for; only the -// folder listing varies per spec, so the other two answer as an unremarkable library does. -type fakeFolderRepo struct { - model.FolderRepository - result []model.Folder - err error -} - -func (f *fakeFolderRepo) GetAll(...model.QueryOptions) ([]model.Folder, error) { - return f.result, f.err -} - -func (f *fakeFolderRepo) HasAudioOutsideFolders(model.Folder, []string) (bool, error) { - return false, nil -} - -func (f *fakeFolderRepo) Get(string) (*model.Folder, error) { - return nil, model.ErrNotFound -}