mirror of
https://github.com/navidrome/navidrome.git
synced 2025-05-14 09:06:38 +03:00
refactor
Signed-off-by: Deluan <deluan@navidrome.org>
This commit is contained in:
parent
99a04e65d5
commit
0bc75774c3
@ -1,4 +0,0 @@
|
|||||||
package extdata
|
|
||||||
|
|
||||||
// Expose internal types for testing
|
|
||||||
type MockAgents = mockAgents
|
|
@ -1,4 +1,4 @@
|
|||||||
package extdata
|
package extdata_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
@ -1,4 +1,4 @@
|
|||||||
package extdata
|
package extdata_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@ -7,6 +7,7 @@ import (
|
|||||||
|
|
||||||
"github.com/navidrome/navidrome/conf"
|
"github.com/navidrome/navidrome/conf"
|
||||||
"github.com/navidrome/navidrome/core/agents"
|
"github.com/navidrome/navidrome/core/agents"
|
||||||
|
. "github.com/navidrome/navidrome/core/extdata"
|
||||||
"github.com/navidrome/navidrome/model"
|
"github.com/navidrome/navidrome/model"
|
||||||
"github.com/navidrome/navidrome/tests"
|
"github.com/navidrome/navidrome/tests"
|
||||||
. "github.com/onsi/ginkgo/v2"
|
. "github.com/onsi/ginkgo/v2"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package extdata
|
package extdata_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@ -7,6 +7,7 @@ import (
|
|||||||
|
|
||||||
"github.com/navidrome/navidrome/conf"
|
"github.com/navidrome/navidrome/conf"
|
||||||
"github.com/navidrome/navidrome/core/agents"
|
"github.com/navidrome/navidrome/core/agents"
|
||||||
|
. "github.com/navidrome/navidrome/core/extdata"
|
||||||
"github.com/navidrome/navidrome/model"
|
"github.com/navidrome/navidrome/model"
|
||||||
"github.com/navidrome/navidrome/tests"
|
"github.com/navidrome/navidrome/tests"
|
||||||
. "github.com/onsi/ginkgo/v2"
|
. "github.com/onsi/ginkgo/v2"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package extdata
|
package extdata_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@ -6,6 +6,7 @@ import (
|
|||||||
|
|
||||||
"github.com/navidrome/navidrome/conf"
|
"github.com/navidrome/navidrome/conf"
|
||||||
"github.com/navidrome/navidrome/core/agents"
|
"github.com/navidrome/navidrome/core/agents"
|
||||||
|
. "github.com/navidrome/navidrome/core/extdata"
|
||||||
"github.com/navidrome/navidrome/model"
|
"github.com/navidrome/navidrome/model"
|
||||||
"github.com/navidrome/navidrome/tests"
|
"github.com/navidrome/navidrome/tests"
|
||||||
. "github.com/onsi/ginkgo/v2"
|
. "github.com/onsi/ginkgo/v2"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package extdata
|
package extdata_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
@ -9,6 +9,7 @@ import (
|
|||||||
_ "github.com/navidrome/navidrome/core/agents/lastfm"
|
_ "github.com/navidrome/navidrome/core/agents/lastfm"
|
||||||
_ "github.com/navidrome/navidrome/core/agents/listenbrainz"
|
_ "github.com/navidrome/navidrome/core/agents/listenbrainz"
|
||||||
_ "github.com/navidrome/navidrome/core/agents/spotify"
|
_ "github.com/navidrome/navidrome/core/agents/spotify"
|
||||||
|
. "github.com/navidrome/navidrome/core/extdata"
|
||||||
"github.com/navidrome/navidrome/model"
|
"github.com/navidrome/navidrome/model"
|
||||||
"github.com/navidrome/navidrome/tests"
|
"github.com/navidrome/navidrome/tests"
|
||||||
. "github.com/onsi/ginkgo/v2"
|
. "github.com/onsi/ginkgo/v2"
|
||||||
@ -21,7 +22,7 @@ var _ = Describe("Provider - TopSongs", func() {
|
|||||||
p Provider
|
p Provider
|
||||||
artistRepo *mockArtistRepo // From provider_helper_test.go
|
artistRepo *mockArtistRepo // From provider_helper_test.go
|
||||||
mediaFileRepo *mockMediaFileRepo // From provider_helper_test.go
|
mediaFileRepo *mockMediaFileRepo // From provider_helper_test.go
|
||||||
ag *MockAgents // Consolidated mock from export_test.go
|
ag *mockAgents // Consolidated mock from export_test.go
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
originalAgentsConfig string
|
originalAgentsConfig string
|
||||||
)
|
)
|
||||||
@ -39,7 +40,7 @@ var _ = Describe("Provider - TopSongs", func() {
|
|||||||
MockedMediaFile: mediaFileRepo,
|
MockedMediaFile: mediaFileRepo,
|
||||||
}
|
}
|
||||||
|
|
||||||
ag = new(MockAgents)
|
ag = new(mockAgents)
|
||||||
|
|
||||||
p = NewProvider(ds, ag)
|
p = NewProvider(ds, ag)
|
||||||
})
|
})
|
||||||
|
@ -26,14 +26,14 @@ var _ = Describe("Provider UpdateAlbumInfo", func() {
|
|||||||
ctx context.Context
|
ctx context.Context
|
||||||
p extdata.Provider
|
p extdata.Provider
|
||||||
ds *tests.MockDataStore
|
ds *tests.MockDataStore
|
||||||
ag *extdata.MockAgents
|
ag *mockAgents
|
||||||
mockAlbumRepo *tests.MockAlbumRepo
|
mockAlbumRepo *tests.MockAlbumRepo
|
||||||
)
|
)
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
ctx = context.Background()
|
ctx = context.Background()
|
||||||
ds = new(tests.MockDataStore)
|
ds = new(tests.MockDataStore)
|
||||||
ag = new(extdata.MockAgents)
|
ag = new(mockAgents)
|
||||||
p = extdata.NewProvider(ds, ag)
|
p = extdata.NewProvider(ds, ag)
|
||||||
mockAlbumRepo = ds.Album(ctx).(*tests.MockAlbumRepo)
|
mockAlbumRepo = ds.Album(ctx).(*tests.MockAlbumRepo)
|
||||||
conf.Server.DevAlbumInfoTimeToLive = 1 * time.Hour
|
conf.Server.DevAlbumInfoTimeToLive = 1 * time.Hour
|
||||||
|
@ -26,14 +26,14 @@ var _ = Describe("Provider UpdateArtistInfo", func() {
|
|||||||
ctx context.Context
|
ctx context.Context
|
||||||
p extdata.Provider
|
p extdata.Provider
|
||||||
ds *tests.MockDataStore
|
ds *tests.MockDataStore
|
||||||
ag *extdata.MockAgents
|
ag *mockAgents
|
||||||
mockArtistRepo *tests.MockArtistRepo
|
mockArtistRepo *tests.MockArtistRepo
|
||||||
)
|
)
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
ctx = context.Background()
|
ctx = context.Background()
|
||||||
ds = new(tests.MockDataStore)
|
ds = new(tests.MockDataStore)
|
||||||
ag = new(extdata.MockAgents)
|
ag = new(mockAgents)
|
||||||
p = extdata.NewProvider(ds, ag)
|
p = extdata.NewProvider(ds, ag)
|
||||||
mockArtistRepo = ds.Artist(ctx).(*tests.MockArtistRepo)
|
mockArtistRepo = ds.Artist(ctx).(*tests.MockArtistRepo)
|
||||||
conf.Server.DevArtistInfoTimeToLive = 1 * time.Hour
|
conf.Server.DevArtistInfoTimeToLive = 1 * time.Hour
|
||||||
|
Loading…
x
Reference in New Issue
Block a user