From e2b3a5098933fe9c602f1a5affe85e5ebfbd9b00 Mon Sep 17 00:00:00 2001 From: KevinBigham Date: Thu, 30 Apr 2026 14:08:11 -0500 Subject: [PATCH] fix(app-test): resolve App.test.tsx conflict markers leaked from Sprint 46 Slice 2 squash merge The Sprint 46 Slice 2 (achievements gallery) squash-merge missed conflict markers in App.test.tsx. This hotfix keeps both new test cases (Sprint 46 Slice 1's emitter-mount test and Slice 2's achievements route test), and updates the route assertion to match the actual additive routeTree.addChildren pattern that resolved against Sprint 45's prior addChildren calls. Co-Authored-By: Claude Opus 4.7 --- apps/web/src/app/App.test.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/web/src/app/App.test.tsx b/apps/web/src/app/App.test.tsx index 8745441..116173c 100644 --- a/apps/web/src/app/App.test.tsx +++ b/apps/web/src/app/App.test.tsx @@ -114,18 +114,17 @@ describe('App Chip setup wiring', () => { expect(content).toContain('dynastyIndicator={{ seasonYear: chipDockSeason, coachName: chipCoachName }}'); }); -<<<<<<< HEAD it('mounts Sprint 46 atmosphere emitters beside the app shell controllers', () => { expect(content).toContain("import { EraTransitionEmitter } from '../features/dynasty-era/EraTransitionEmitter'"); expect(content).toContain("import { ChampionshipParadeEmitter } from '../features/playoffs/ChampionshipParadeEmitter'"); expect(content).toContain(''); expect(content).toContain(''); expect(content).toContain(''); -======= + }); + it('registers the Sprint 46 achievements gallery route additively', () => { expect(content).toContain("const LazyAchievementsGallery = lazy(async () => ({ default: (await import('../features/franchise/AchievementsGallery')).AchievementsGallery }));"); expect(content).toContain("path: '/franchise/achievements'"); - expect(content).toContain('routeTree.addChildren([achievementsRoute]);'); ->>>>>>> 9ca31c9 (Sprint 46: Add achievements gallery) + expect(content).toContain('routeTree.addChildren([...(routeTree.children ?? []), achievementsRoute]);'); }); });