Default leaderboard to all maps

tests/unit/leaderboard-page-load.test.ts

@@ -1,9 +1,7 @@
 import { beforeEach, expect, it, vi } from 'vitest';
 import { GET } from '../../src/routes/api/leaderboard/+server.js';
 import { load } from '../../src/routes/leaderboard/+page.server.js';
-import { defaultLeaderboardMap } from '../../src/lib/server/fleet/leaderboard.js';
 vi.mock('../../src/routes/api/leaderboard/+server.js', () => ({ GET: vi.fn() }));
-vi.mock('../../src/lib/server/fleet/leaderboard.js', () => ({ defaultLeaderboardMap: vi.fn() }));
 beforeEach(() => { vi.clearAllMocks(); });
 it('requests the same 25-player page on initial load and preserves filters without mutating the page URL', async () => {
     vi.mocked(GET).mockResolvedValueOnce(new Response(JSON.stringify({ entries: [], limit: 25, offset: 25 })));
@@ -17,22 +15,21 @@ it('requests the same 25-player page on initial load and preserves filters witho
     expect(data.leaderboard.limit).toBe(25);
 });
 
-it('opens a missing map at a recorded map in the selected game and squad without a whole-fleet report', async () => {
-    vi.mocked(defaultLeaderboardMap).mockReturnValue('t6:town');
-    const url = new URL('http://localhost/leaderboard?game=t6&players=2&metric=kills&q=Cherry&offset=25');
+it.each(['', '?game=t6&players=2&metric=kills&q=Cherry&offset=25'])('defaults to All maps without redirecting or changing other filters: %s', async query => {
+    vi.mocked(GET).mockResolvedValueOnce(new Response(JSON.stringify({ entries: [], maps: [{ key: 't6:town' }], limit: 25 })));
+    const url = new URL(`http://localhost/leaderboard${query}`);
     const original = url.href;
-    await expect(load({ url })).rejects.toMatchObject({ status: 307, location: '/leaderboard?game=t6&players=2&metric=kills&q=Cherry&map=t6%3Atown' });
-    expect(defaultLeaderboardMap).toHaveBeenCalledWith({ game: 't6', players: 2 });
-    expect(GET).not.toHaveBeenCalled(); expect(url.href).toBe(original);
+    expect(await load({ url })).toMatchObject({ leaderboard: { entries: [], limit: 25 } });
+    const requested = vi.mocked(GET).mock.calls[0][0].url;
+    expect(requested.searchParams.has('map')).toBe(false);
+    for (const key of ['game', 'players', 'metric', 'q', 'offset']) expect(requested.searchParams.get(key)).toBe(url.searchParams.get(key));
+    expect(url.href).toBe(original);
 });
 
 it('honors explicit All maps and handles an empty recorded-map catalog without redirecting', async () => {
     vi.mocked(GET).mockResolvedValue(new Response(JSON.stringify({ entries: [], maps: [], limit: 25 })));
     await load({ url: new URL('http://localhost/leaderboard?map=&players=3') });
-    expect(defaultLeaderboardMap).not.toHaveBeenCalled();
     expect(vi.mocked(GET).mock.calls[0][0].url.searchParams.get('map')).toBe('');
-    vi.mocked(defaultLeaderboardMap).mockReturnValue(null);
     vi.mocked(GET).mockResolvedValueOnce(new Response(JSON.stringify({ entries: [], maps: [], limit: 25 })));
     expect(await load({ url: new URL('http://localhost/leaderboard') })).toMatchObject({ leaderboard: { entries: [], maps: [] } });
-    expect(defaultLeaderboardMap).toHaveBeenCalledOnce();
 });

tests/unit/leaderboard-players.test.ts

@@ -67,19 +67,6 @@ describe('leaderboard starting-player scopes', () => {
             scope: { players: '2', entry: { gamesPlayed: 30, highestRound: 20, records: { highestRound: { matchId: 1 } } } } });
     });
 
-    it('chooses a deterministic usable default map within game and squad, ignoring unfinished and statless records', async () => {
-        const { db } = await import('../../src/lib/server/db/index.js');
-        seed(db(), 1, 2); seed(db(), 2, 3, { map: 'moon', mapName: 'Moon' });
-        seed(db(), 3, 4, { game: 't6', map: 'town', mapName: 'Town' });
-        seed(db(), 4, 2, { map: 'empty', mapName: 'A statless map', hasStats: 0 });
-        seed(db(), 5, 2, { map: 'active', mapName: 'A match in progress', status: 'active' });
-        const { defaultLeaderboardMap } = await import('../../src/lib/server/fleet/leaderboard.js');
-        expect(defaultLeaderboardMap()).toBe('t5:theater');
-        expect(defaultLeaderboardMap({ players: 3 })).toBe('t5:moon');
-        expect(defaultLeaderboardMap({ game: 't6' })).toBe('t6:town');
-        expect(defaultLeaderboardMap({ game: 't5', players: 4 })).toBeNull();
-    });
-
     it('keeps API absent-map searches global while filtering all contributions by the selected squad', async () => {
         const { db } = await import('../../src/lib/server/db/index.js');
         seed(db(), 1, 2); seed(db(), 2, 2, { map: 'moon', mapName: 'Moon' }); seed(db(), 3, null, { round: 99 });