Skip to content

fix: clean up App.test.tsx conflict markers from Sprint 46 Slice 2 squash #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinBigham merged 1 commit into from
Apr 30, 2026
Merged

fix: clean up App.test.tsx conflict markers from Sprint 46 Slice 2 squash #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions apps/web/src/app/App.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('<AudioController />');
expect(content).toContain('<EraTransitionEmitter />');
expect(content).toContain('<ChampionshipParadeEmitter />');
=======
});

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]);');
});
});
Loading