more

tests/builders.ts

@@ -13,7 +13,8 @@ import {
   SimilarArtist,
   AlbumSummary,
   RadioStation,
-  ArtistSummary
+  ArtistSummary,
+  TrackSummary
 } from "../src/music_library";
 
 import { b64Encode } from "../src/b64";
@@ -178,12 +179,11 @@ export const SAMPLE_GENRES = [
 ];
 export const randomGenre = () => SAMPLE_GENRES[randomInt(SAMPLE_GENRES.length)];
 
-export function aTrack(fields: Partial<Track> = {}): Track {
+export function aTrackSummary(fields: Partial<TrackSummary> = {}): TrackSummary {
   const id = uuid();
   const artist = fields.artist || anArtistSummary();
   const genre = fields.genre || randomGenre();
   const rating = { love: false, stars: Math.floor(Math.random() * 5) };
-  const album = fields.album || anAlbumSummary({ artistId: artist.id, artistName: artist.name, genre })
   return {
     id,
     name: `Track ${id}`,
@@ -195,12 +195,21 @@ export function aTrack(fields: Partial<Track> = {}): Track {
     number: randomInt(100),
     genre,
     artist,
-    album,
     coverArt: { system: "subsonic", resource: `art:${uuid()}`},
     rating,
     ...fields,
   };
-}
+};
+
+export function aTrack(fields: Partial<Track> = {}): Track {
+  const summary = aTrackSummary(fields);
+  const album = fields.album || anAlbumSummary({ artistId: summary.artist.id, artistName: summary.artist.name, genre: summary.genre })
+  return {
+    ...summary,
+    album,
+    ...fields
+  };
+};
 
 export function anAlbumSummary(fields: Partial<AlbumSummary> = {}): AlbumSummary {
   const id = uuid();
@@ -213,7 +222,7 @@ export function anAlbumSummary(fields: Partial<AlbumSummary> = {}): AlbumSummary
     artistId: `Artist ${uuid()}`,
     artistName: `Artist ${randomstring.generate()}`,
     ...fields
-  }
+  };
 };
 
 export function anAlbum(fields: Partial<Album> = {}): Album {

tests/subsonic_music_library.test.ts

@@ -19,7 +19,6 @@ import {
   CustomPlayers,
   PingResponse,
   images,
-  
 } from "../src/subsonic";
 
 import {
@@ -42,6 +41,7 @@ import {
   AuthFailure,
   RadioStation,
   AlbumSummary,
+  trackToTrackSummary,
 } from "../src/music_library";
 import {
   aGenre,
@@ -4216,21 +4216,18 @@ describe("SubsonicMusicLibrary", () => {
         const track1 = aTrack({
           id: "track1",
           artist: artistToArtistSummary(artist1),
-          album: albumToAlbumSummary(album1),
+          album: album1,
           genre: pop,
         });
 
         mockGET
           .mockImplementationOnce(() =>
             Promise.resolve(ok(getSimilarSongsJson([track1])))
-          )
-          .mockImplementationOnce(() =>
-            Promise.resolve(ok(getAlbumJson(album1)))
           );
 
         const result = await subsonic.similarSongs(id);
 
-        expect(result).toEqual([track1]);
+        expect(result).toEqual([trackToTrackSummary(track1)]);
 
         expect(mockGET).toHaveBeenCalledWith(
           url.append({ pathname: "/rest/getSimilarSongs2" }).href(),
@@ -4288,20 +4285,15 @@ describe("SubsonicMusicLibrary", () => {
         mockGET
           .mockImplementationOnce(() =>
             Promise.resolve(ok(getSimilarSongsJson([track1, track2, track3])))
-          )
-          .mockImplementationOnce(() =>
-            Promise.resolve(ok(getAlbumJson(album1)))
-          )
-          .mockImplementationOnce(() =>
-            Promise.resolve(ok(getAlbumJson(album2)))
-          )
-          .mockImplementationOnce(() =>
-            Promise.resolve(ok(getAlbumJson(album1)))
           );
 
         const result = await subsonic.similarSongs(id);
 
-        expect(result).toEqual([track1, track2, track3]);
+        expect(result).toEqual([
+          trackToTrackSummary(track1), 
+          trackToTrackSummary(track2), 
+          trackToTrackSummary(track3), 
+        ]);
 
         expect(mockGET).toHaveBeenCalledWith(
           url.append({ pathname: "/rest/getSimilarSongs2" }).href(),
@@ -4390,14 +4382,13 @@ describe("SubsonicMusicLibrary", () => {
           )
           .mockImplementationOnce(() =>
             Promise.resolve(ok(getTopSongsJson([track1])))
-          )
-          .mockImplementationOnce(() =>
-            Promise.resolve(ok(getAlbumJson(album1)))
           );
 
         const result = await subsonic.topSongs(artistId);
 
-        expect(result).toEqual([track1]);
+        expect(result).toEqual([
+          trackToTrackSummary(track1)
+        ]);
 
         expect(mockGET).toHaveBeenCalledWith(
           url.append({ pathname: "/rest/getTopSongs" }).href(),
@@ -4452,20 +4443,15 @@ describe("SubsonicMusicLibrary", () => {
           )
           .mockImplementationOnce(() =>
             Promise.resolve(ok(getTopSongsJson([track1, track2, track3])))
-          )
-          .mockImplementationOnce(() =>
-            Promise.resolve(ok(getAlbumJson(album1)))
-          )
-          .mockImplementationOnce(() =>
-            Promise.resolve(ok(getAlbumJson(album2)))
-          )
-          .mockImplementationOnce(() =>
-            Promise.resolve(ok(getAlbumJson(album1)))
           );
 
         const result = await subsonic.topSongs(artistId);
 
-        expect(result).toEqual([track1, track2, track3]);
+        expect(result).toEqual([
+          trackToTrackSummary(track1), 
+          trackToTrackSummary(track2), 
+          trackToTrackSummary(track3), 
+        ]);
 
         expect(mockGET).toHaveBeenCalledWith(
           url.append({ pathname: "/rest/getTopSongs" }).href(),