Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 5 deletions src/apps/golf/components/GolfTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@ const GolfTable = ({ playerId, connected, view, table, shareUrl = null }: GolfTa
const acting = isMyTurn && connected
const inPlay = view.gamePhase === 'playing' || view.gamePhase === 'knocked'

const isWinner = (player: Player | undefined) => {
if (player === undefined || ended === null) return false
if (ended.winners.length > 0) return ended.winners.includes(player.id)
return player.id === ended.winner
}
const isWinner = (player: Player | undefined) =>
player !== undefined && ended !== null && ended.winners.includes(player.id)

useEffect(() => {
if (view.gamePhase === 'ended') {
Expand Down
12 changes: 12 additions & 0 deletions src/apps/golf/components/__tests__/GolfTable.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,18 @@ describe('GolfTable', () => {
expect(screen.getAllByText('👑')).toHaveLength(2)
})

// The contract requires winners (golf.smithy GameEnded); winner is only
// display text, so it never crowns anyone on its own.
it('only the winners list crowns; the display string does not', () => {
vi.useFakeTimers()
const t = table({ ended: { winner: 'alice', winners: [] } })
render(<GolfTable playerId="alice" connected view={view({ gamePhase: 'ended' })} table={t} />)
expect(screen.queryByText('You won!')).toBeNull()
expect(screen.getByText('alice wins!')).toBeTruthy()
act(() => vi.advanceTimersByTime(3000))
expect(screen.queryByText('👑')).toBeNull()
})

it('an ended table with no result yet is just over', () => {
render(<GolfTable playerId="alice" connected view={view({ gamePhase: 'ended' })} table={table()} />)
expect(screen.getByText('Game over')).toBeTruthy()
Expand Down
Loading