Upgrade Ginkgo to V2

Makefile

@@ -25,7 +25,7 @@ server: check_go_env  ##@Development Start the backend in development mode
 .PHONY: server
 
 watch: ##@Development Start Go tests in watch mode (re-run when code changes)
-	go run github.com/onsi/ginkgo/ginkgo watch -notify ./...
+	go run github.com/onsi/ginkgo/v2/ginkgo watch -notify ./...
 .PHONY: watch
 
 test: ##@Development Run Go tests
@@ -49,7 +49,7 @@ wire: check_go_env ##@Development Update Dependency Injection
 .PHONY: wire
 
 snapshots: ##@Development Update (GoLang) Snapshot tests
-	UPDATE_SNAPSHOTS=true go run github.com/onsi/ginkgo/ginkgo ./server/subsonic/...
+	UPDATE_SNAPSHOTS=true go run github.com/onsi/ginkgo/v2/ginkgo ./server/subsonic/...
 .PHONY: snapshots
 
 migration: ##@Development Create an empty migration file

core/agents/agents_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/agents_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/navidrome/navidrome/tests"
 
 	"github.com/navidrome/navidrome/conf"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/lastfm/agent_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/navidrome/navidrome/core/scrobbler"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/lastfm/client_test.go

@@ -12,7 +12,7 @@ import (
 	"os"
 
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/lastfm/lastfm_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/lastfm/responses_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"os"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/listenbrainz/agent_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/navidrome/navidrome/core/scrobbler"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
 )

core/agents/listenbrainz/auth_router_test.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/listenbrainz/client_test.go

@@ -9,7 +9,7 @@ import (
 	"os"
 
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/listenbrainz/listenbrainz_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/session_keys_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/spotify/client_test.go

@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"os"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/spotify/responses_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"os"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/agents/spotify/spotify_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/artwork_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/auth/auth_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/navidrome/navidrome/core/auth"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
@@ -25,10 +25,11 @@ const (
 	oneDay        = 24 * time.Hour
 )
 
+var _ = BeforeSuite(func() {
+	conf.Server.SessionTimeout = 2 * oneDay
+})
+
 var _ = Describe("Auth", func() {
-	BeforeSuite(func() {
-		conf.Server.SessionTimeout = 2 * oneDay
-	})
 
 	BeforeEach(func() {
 		auth.Secret = []byte(testJWTSecret)

core/core_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/media_streamer_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/players_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/playlists_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/scrobbler/play_tracker_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/server/events"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/scrobbler/scrobbler_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/share_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/deluan/rest"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

core/transcoder/transcoder_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

db/db_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

go.mod

@@ -33,7 +33,7 @@ require (
 	github.com/microcosm-cc/bluemonday v1.0.17
 	github.com/mileusna/useragent v1.1.0
 	github.com/oklog/run v1.1.0
-	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/ginkgo/v2 v2.1.4
 	github.com/onsi/gomega v1.20.0
 	github.com/pressly/goose v2.7.0+incompatible
 	github.com/robfig/cron/v3 v3.0.1
@@ -113,6 +113,7 @@ require (
 	github.com/golangci/revgrep v0.0.0-20210930125155-c22e5001d4f2 // indirect
 	github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
 	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/google/subcommands v1.0.1 // indirect
 	github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
 	github.com/gorilla/css v1.0.0 // indirect
@@ -166,9 +167,9 @@ require (
 	github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
 	github.com/nishanths/exhaustive v0.8.1 // indirect
 	github.com/nishanths/predeclared v0.2.2 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/ogier/pflag v0.0.1 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.2 // indirect
 	github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
@@ -223,10 +224,9 @@ require (
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/ini.v1 v1.66.6 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	honnef.co/go/tools v0.3.2 // indirect

go.sum

@@ -371,6 +371,7 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/subcommands v1.0.1 h1:/eqq+otEXm5vhfBrbREPCSVQbvofip6kIz+mX5TUH7k=
@@ -1100,8 +1101,9 @@ golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

log/formatters_test.go

@@ -3,7 +3,7 @@ package log
 import (
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

log/log_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/sirupsen/logrus"
 	"github.com/sirupsen/logrus/hooks/test"

model/criteria/criteria_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/navidrome/navidrome/log"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 )
 

model/criteria/criteria_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 )
 

model/criteria/operators_test.go

@@ -5,8 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/ginkgo/extensions/table"
+	. "github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 )
 

model/model_suite_test.go

@@ -6,7 +6,7 @@ import (
 	_ "github.com/mattn/go-sqlite3"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/album_repository_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/artist_repository_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
 )

persistence/genre_repository_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/persistence"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/helpers_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/model"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/mediafile_repository_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/persistence_suite_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
@@ -79,101 +79,99 @@ func P(path string) string {
 	return filepath.FromSlash(path)
 }
 
-var _ = Describe("Initialize test DB", func() {
+// Initialize test DB
+// TODO Load this data setup from file(s)
+var _ = BeforeSuite(func() {
+	o := orm.NewOrm()
+	ctx := log.NewContext(context.TODO())
+	user := model.User{ID: "userid", UserName: "userid"}
+	ctx = request.WithUser(ctx, user)
 
-	// TODO Load this data setup from file(s)
-	BeforeSuite(func() {
-		o := orm.NewOrm()
-		ctx := log.NewContext(context.TODO())
-		user := model.User{ID: "userid", UserName: "userid"}
-		ctx = request.WithUser(ctx, user)
+	ur := NewUserRepository(ctx, o)
+	err := ur.Put(&user)
+	if err != nil {
+		panic(err)
+	}
 
-		ur := NewUserRepository(ctx, o)
-		err := ur.Put(&user)
+	gr := NewGenreRepository(ctx, o)
+	for i := range testGenres {
+		g := testGenres[i]
+		err := gr.Put(&g)
 		if err != nil {
 			panic(err)
 		}
+	}
 
-		gr := NewGenreRepository(ctx, o)
-		for i := range testGenres {
-			g := testGenres[i]
-			err := gr.Put(&g)
-			if err != nil {
-				panic(err)
-			}
-		}
-
-		mr := NewMediaFileRepository(ctx, o)
-		for i := range testSongs {
-			s := testSongs[i]
-			err := mr.Put(&s)
-			if err != nil {
-				panic(err)
-			}
-		}
-
-		alr := NewAlbumRepository(ctx, o).(*albumRepository)
-		for i := range testAlbums {
-			a := testAlbums[i]
-			err := alr.Put(&a)
-			if err != nil {
-				panic(err)
-			}
-		}
-
-		arr := NewArtistRepository(ctx, o)
-		for i := range testArtists {
-			a := testArtists[i]
-			err := arr.Put(&a)
-			if err != nil {
-				panic(err)
-			}
-		}
-
-		plsBest = model.Playlist{
-			Name:      "Best",
-			Comment:   "No Comments",
-			OwnerID:   "userid",
-			OwnerName: "userid",
-			Public:    true,
-			SongCount: 2,
-		}
-		plsBest.AddTracks([]string{"1001", "1003"})
-		plsCool = model.Playlist{Name: "Cool", OwnerID: "userid", OwnerName: "userid"}
-		plsCool.AddTracks([]string{"1004"})
-		testPlaylists = []*model.Playlist{&plsBest, &plsCool}
-
-		pr := NewPlaylistRepository(ctx, o)
-		for i := range testPlaylists {
-			err := pr.Put(testPlaylists[i])
-			if err != nil {
-				panic(err)
-			}
-		}
-
-		// Prepare annotations
-		if err := arr.SetStar(true, artistBeatles.ID); err != nil {
+	mr := NewMediaFileRepository(ctx, o)
+	for i := range testSongs {
+		s := testSongs[i]
+		err := mr.Put(&s)
+		if err != nil {
 			panic(err)
 		}
-		ar, _ := arr.Get(artistBeatles.ID)
-		artistBeatles.Starred = true
-		artistBeatles.StarredAt = ar.StarredAt
-		testArtists[1] = artistBeatles
+	}
 
-		if err := alr.SetStar(true, albumRadioactivity.ID); err != nil {
+	alr := NewAlbumRepository(ctx, o).(*albumRepository)
+	for i := range testAlbums {
+		a := testAlbums[i]
+		err := alr.Put(&a)
+		if err != nil {
 			panic(err)
 		}
-		al, _ := alr.Get(albumRadioactivity.ID)
-		albumRadioactivity.Starred = true
-		albumRadioactivity.StarredAt = al.StarredAt
-		testAlbums[2] = albumRadioactivity
+	}
 
-		if err := mr.SetStar(true, songComeTogether.ID); err != nil {
+	arr := NewArtistRepository(ctx, o)
+	for i := range testArtists {
+		a := testArtists[i]
+		err := arr.Put(&a)
+		if err != nil {
 			panic(err)
 		}
-		mf, _ := mr.Get(songComeTogether.ID)
-		songComeTogether.Starred = true
-		songComeTogether.StarredAt = mf.StarredAt
-		testSongs[1] = songComeTogether
-	})
+	}
+
+	plsBest = model.Playlist{
+		Name:      "Best",
+		Comment:   "No Comments",
+		OwnerID:   "userid",
+		OwnerName: "userid",
+		Public:    true,
+		SongCount: 2,
+	}
+	plsBest.AddTracks([]string{"1001", "1003"})
+	plsCool = model.Playlist{Name: "Cool", OwnerID: "userid", OwnerName: "userid"}
+	plsCool.AddTracks([]string{"1004"})
+	testPlaylists = []*model.Playlist{&plsBest, &plsCool}
+
+	pr := NewPlaylistRepository(ctx, o)
+	for i := range testPlaylists {
+		err := pr.Put(testPlaylists[i])
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	// Prepare annotations
+	if err := arr.SetStar(true, artistBeatles.ID); err != nil {
+		panic(err)
+	}
+	ar, _ := arr.Get(artistBeatles.ID)
+	artistBeatles.Starred = true
+	artistBeatles.StarredAt = ar.StarredAt
+	testArtists[1] = artistBeatles
+
+	if err := alr.SetStar(true, albumRadioactivity.ID); err != nil {
+		panic(err)
+	}
+	al, _ := alr.Get(albumRadioactivity.ID)
+	albumRadioactivity.Starred = true
+	albumRadioactivity.StarredAt = al.StarredAt
+	testAlbums[2] = albumRadioactivity
+
+	if err := mr.SetStar(true, songComeTogether.ID); err != nil {
+		panic(err)
+	}
+	mf, _ := mr.Get(songComeTogether.ID)
+	songComeTogether.Starred = true
+	songComeTogether.StarredAt = mf.StarredAt
+	testSongs[1] = songComeTogether
 })

persistence/playlist_repository_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/playqueue_repository_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/property_repository_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/astaxie/beego/orm"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/sql_base_repository_test.go

@@ -3,7 +3,7 @@ package persistence
 import (
 	"github.com/Masterminds/squirrel"
 	"github.com/navidrome/navidrome/model"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/sql_bookmarks_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/sql_restful_test.go

@@ -3,7 +3,7 @@ package persistence
 import (
 	"github.com/Masterminds/squirrel"
 	"github.com/deluan/rest"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/sql_search_test.go

@@ -1,7 +1,7 @@
 package persistence
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

persistence/user_repository_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/mapping_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/navidrome/navidrome/conf"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/metadata/ffmpeg/ffmpeg_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/metadata/ffmpeg/ffmpeg_test.go

@@ -1,7 +1,7 @@
 package ffmpeg
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/metadata/metadata_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/metadata/metadata_test.go

@@ -2,7 +2,7 @@ package metadata
 
 import (
 	"github.com/navidrome/navidrome/conf"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/metadata/taglib/taglib_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/metadata/taglib/taglib_test.go

@@ -1,7 +1,7 @@
 package taglib
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/playlist_importer_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/scanner_suite_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/navidrome/navidrome/db"
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/tag_scanner_test.go

@@ -1,7 +1,7 @@
 package scanner
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

scanner/walk_dir_tree_test.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"testing/fstest"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
 )

server/auth_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/navidrome/navidrome/core/auth"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/events/diode_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"code.cloudfoundry.org/go-diodes"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/events/events_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/events/events_test.go

@@ -1,7 +1,7 @@
 package events
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/events/sse_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/navidrome/navidrome/model/request"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/initial_setup_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/middlewares_test.go

@@ -5,7 +5,7 @@ import (
 	"net/http/httptest"
 	"os"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/nativeapi/native_api_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/nativeapi/translations_test.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/resources"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/serve_index_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/navidrome/navidrome/consts"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/server_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/subsonic/album_lists_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/subsonic/api_suite_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/navidrome/navidrome/log"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/subsonic/media_annotation_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/navidrome/navidrome/server/events"
 	"github.com/navidrome/navidrome/tests"
 	"github.com/navidrome/navidrome/utils"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/subsonic/media_retrieval_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/subsonic/middlewares_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/navidrome/navidrome/model"
 	"github.com/navidrome/navidrome/model/request"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

server/subsonic/responses/responses_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/bradleyjkemp/cupaloy"
 	"github.com/navidrome/navidrome/log"
-	"github.com/onsi/ginkgo"
+	"github.com/onsi/ginkgo/v2"
 	"github.com/onsi/gomega"
 	"github.com/onsi/gomega/types"
 )
@@ -26,7 +26,7 @@ type snapshotMatcher struct {
 }
 
 func (matcher snapshotMatcher) Match(actual interface{}) (success bool, err error) {
-	err = matcher.c.SnapshotMulti(ginkgo.CurrentGinkgoTestDescription().FullTestText, actual)
+	err = matcher.c.SnapshotMulti(ginkgo.CurrentSpecReport().FullText(), actual)
 	success = err == nil
 	return
 }

server/subsonic/responses/responses_test.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/navidrome/navidrome/consts"
 	. "github.com/navidrome/navidrome/server/subsonic/responses"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

tools.go

@@ -7,7 +7,7 @@ import (
 	_ "github.com/cespare/reflex"
 	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 	_ "github.com/google/wire/cmd/wire"
-	_ "github.com/onsi/ginkgo/ginkgo"
+	_ "github.com/onsi/ginkgo/v2/ginkgo"
 	_ "github.com/pressly/goose/cmd/goose"
 	_ "golang.org/x/tools/cmd/goimports"
 )

utils/atomic_test.go

@@ -2,7 +2,7 @@ package utils_test
 
 import (
 	"github.com/navidrome/navidrome/utils"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/cache/cache_suite_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/cache/file_caches_test.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/navidrome/navidrome/conf"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/cache/spread_fs_test.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/cached_http_client_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/navidrome/navidrome/consts"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/context_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/navidrome/navidrome/utils"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/encrypt_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"crypto/sha256"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/files_test.go

@@ -3,7 +3,7 @@ package utils
 import (
 	"path/filepath"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/gravatar/gravatar_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
 	"github.com/navidrome/navidrome/utils/gravatar"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/index_group_parser_test.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/ints_test.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/merge_fs_test.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/navidrome/navidrome/utils"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/pool/pool_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/navidrome/navidrome/log"
 	"github.com/navidrome/navidrome/tests"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/request_helpers_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/sanitize_strings_test.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/singleton/singleton_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/google/uuid"
 
 	"github.com/navidrome/navidrome/utils/singleton"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/strings_test.go

@@ -2,7 +2,7 @@ package utils
 
 import (
 	"github.com/navidrome/navidrome/conf"
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/time_test.go

@@ -3,7 +3,7 @@ package utils
 import (
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/utils_suite_test.go

@@ -3,7 +3,7 @@ package utils
 import (
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 

utils/weighted_random_chooser_test.go

@@ -1,7 +1,7 @@
 package utils
 
 import (
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )