Skip to content

Commit 501091d

Browse files
gregorrieglergregorriegler
committed
r
1 parent 26d5b71 commit 501091d

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed

‎webapp/src/Help.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function Help({game, timeIsOver, onClose}) {
77
{timeIsOver &&
88
<>
99
<h2>Time is over</h2>
10-
<h3 title="Next Typing"><span className="yellow">{game.driver()}</span>, you're the next Typing
10+
<h3 title="Next Typing"><span className="yellow">{game.typer()}</span>, you're the next Typing
1111
</h3>
1212
<h3 title="Next Navigator"><span className="yellow">{game.navigator()}</span>, you're the next
1313
Navigator</h3>

‎webapp/src/MobProgrammingRPG.spec.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import React from "react";
44
import { gameIdFromUrl } from "./infrastructure/GameIdFromUrl";
55
import MobProgrammingRPG from "./MobProgrammingRPG";
66
import { ClockStub, MilliSeconds } from "./model/Clock";
7-
import { GAMEPLAY_ORDER_DRIVER_THEN_NAVIGATOR, Game, GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER } from "./model/Game";
7+
import { GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR, Game, GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER } from "./model/Game";
88
import { getButton } from "./TestHarnessConvenienceFunctions";
99

1010
function getPlayerListItems() {
@@ -241,11 +241,11 @@ describe('Mob Programming RPG', () => {
241241
render(<MobProgrammingRPG />);
242242
fireEvent.click(getSettingsButton());
243243

244-
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER }));
245-
expect(getButton({ name: GAMEPLAY_ORDER_DRIVER_THEN_NAVIGATOR })).toBeInTheDocument();
244+
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER }));
245+
expect(getButton({ name: GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR })).toBeInTheDocument();
246246

247-
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_DRIVER_THEN_NAVIGATOR }));
248-
expect(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER })).toBeInTheDocument();
247+
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR }));
248+
expect(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER })).toBeInTheDocument();
249249
})
250250

251251
it('that allows to change rotation direction to (Navigator,Typing)', () => {
@@ -254,7 +254,7 @@ describe('Mob Programming RPG', () => {
254254
render(<MobProgrammingRPG initGame={game} />);
255255
fireEvent.click(getSettingsButton());
256256

257-
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER }));
257+
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER }));
258258
fireEvent.click(screen.getByText("Save"));
259259

260260
expect(game.navigatorThenTyping).toHaveBeenCalledTimes(1);
@@ -267,8 +267,8 @@ describe('Mob Programming RPG', () => {
267267
render(<MobProgrammingRPG initGame={game} />);
268268
fireEvent.click(getSettingsButton());
269269

270-
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER }));
271-
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_DRIVER_THEN_NAVIGATOR }));
270+
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER }));
271+
fireEvent.click(getButton({ name: GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR }));
272272
fireEvent.click(screen.getByText("Save"));
273273

274274
expect(game.navigatorThenTyping).not.toHaveBeenCalled();

‎webapp/src/PlayerDisplay.spec.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,17 +51,17 @@ describe('PlayerDisplay', () => {
5151
render(<PlayerDisplay player={new Player("Roger")} />);
5252

5353
function roleInitialized(role: string) {
54-
const driverPoints = screen.getByLabelText(role);
55-
expect(driverPoints).toHaveValue("0");
56-
expect(driverPoints).toBeDisabled();
54+
const typerPoints = screen.getByLabelText(role);
55+
expect(typerPoints).toHaveValue("0");
56+
expect(typerPoints).toBeDisabled();
5757
}
5858

5959
roleInitialized('Typing');
6060
roleInitialized('Navigator');
6161
roleInitialized('Mobber');
6262
});
6363

64-
it('adds driver points', () => {
64+
it('adds typer points', () => {
6565
render(<PlayerDisplay player={new Player("Roger")} />);
6666
player.clickAddPoints('Typing');
6767
expect(player.addPointsInput()).toBeInTheDocument();

‎webapp/src/Settings.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useState } from "react";
2-
import { GAMEPLAY_ORDER_DRIVER_THEN_NAVIGATOR, Game, GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER } from "./model/Game";
2+
import { GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR, Game, GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER } from "./model/Game";
33

44
export function Settings({ game, updateGameState, onClose }: { game: Game, updateGameState: () => void, onClose: () => void }) {
55

@@ -9,7 +9,7 @@ export function Settings({ game, updateGameState, onClose }: { game: Game, updat
99
const timer = formData.get("change-timer") as string;
1010
game.setPlayers(players);
1111
game.changeTimer(parseInt(timer) * 60);
12-
if (roles === GAMEPLAY_ORDER_DRIVER_THEN_NAVIGATOR) {
12+
if (roles === GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR) {
1313
game.navigatorThenTyping();
1414
} else {
1515
game.typingThenNavigator();
@@ -18,13 +18,13 @@ export function Settings({ game, updateGameState, onClose }: { game: Game, updat
1818
event.preventDefault();
1919
};
2020

21-
const [roles, setRoles] = useState(GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER);
21+
const [roles, setRoles] = useState(GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER);
2222

2323
function onClickRoles() {
24-
if (roles === GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER) {
25-
setRoles(GAMEPLAY_ORDER_DRIVER_THEN_NAVIGATOR)
24+
if (roles === GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER) {
25+
setRoles(GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR)
2626
} else {
27-
setRoles(GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER)
27+
setRoles(GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER)
2828
}
2929
}
3030

‎webapp/src/model/Game.spec.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ describe('Game', () => {
122122
]);
123123
});
124124

125-
it('has the first player starting as a driver', () => {
125+
it('has the first player starting as a typer', () => {
126126
const game = createGame();
127127

128128
game.setPlayers('Max,Rita, Peter');
129129

130-
expect(game.driver()).toEqual('Max');
130+
expect(game.typer()).toEqual('Max');
131131
expect(game.navigator()).toEqual('Rita');
132132
expect(game.next()).toEqual('Peter');
133133
expect(game.positionOf('Max')).toEqual('Typing');
@@ -141,7 +141,7 @@ describe('Game', () => {
141141

142142
game.navigatorThenTyping();
143143

144-
expect(game.driver()).toEqual('Rita');
144+
expect(game.typer()).toEqual('Rita');
145145
expect(game.navigator()).toEqual('Max');
146146
expect(game.next()).toEqual('Peter');
147147
expect(game.positionOf('Rita')).toEqual('Typing');
@@ -156,7 +156,7 @@ describe('Game', () => {
156156

157157
game.typingThenNavigator();
158158

159-
expect(game.driver()).toEqual('Max');
159+
expect(game.typer()).toEqual('Max');
160160
expect(game.navigator()).toEqual('Rita');
161161
expect(game.next()).toEqual('Peter');
162162
expect(game.positionOf('Max')).toEqual('Typing');
@@ -209,7 +209,7 @@ describe('Game', () => {
209209

210210
game.rotate();
211211

212-
expect(game.driver()).toEqual('Rita');
212+
expect(game.typer()).toEqual('Rita');
213213
expect(game.navigator()).toEqual('Peter');
214214
expect(game.positionOf('Rita')).toEqual('Typing');
215215
expect(game.positionOf('Peter')).toEqual('Navigator');
@@ -225,7 +225,7 @@ describe('Game', () => {
225225

226226
game.rotateToTarget();
227227

228-
expect(game.driver()).toEqual('Rita');
228+
expect(game.typer()).toEqual('Rita');
229229
expect(game.navigator()).toEqual('Peter');
230230
expect(game.positionOf('Rita')).toEqual('Typing');
231231
expect(game.positionOf('Peter')).toEqual('Navigator');
@@ -240,7 +240,7 @@ describe('Game', () => {
240240
game.rotate();
241241
game.rotate();
242242

243-
expect(game.driver()).toEqual('Peter');
243+
expect(game.typer()).toEqual('Peter');
244244
expect(game.navigator()).toEqual('Sam');
245245
});
246246

@@ -251,7 +251,7 @@ describe('Game', () => {
251251

252252
game.rotate();
253253

254-
expect(game.driver()).toEqual('Peter');
254+
expect(game.typer()).toEqual('Peter');
255255
expect(game.navigator()).toEqual('Rita');
256256
expect(game.positionOf('Peter')).toEqual('Typing');
257257
expect(game.positionOf('Rita')).toEqual('Navigator');

‎webapp/src/model/Game.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Avatar, Player } from "./Player";
22

3-
const DRIVER = "Typing";
3+
const TYPER = "Typing";
44
const NAVIGATOR = "Navigator";
5-
export const GAMEPLAY_ORDER_DRIVER_THEN_NAVIGATOR: string = "Typing,Navigator"
6-
export const GAMEPLAY_ORDER_NAVIGATOR_THEN_DRIVER: string = "Navigator,Typing"
5+
export const GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR: string = "Typing,Navigator"
6+
export const GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER: string = "Navigator,Typing"
77

88
export type GameId = string;
99
type Seconds = number;
@@ -45,7 +45,7 @@ export class Game {
4545
private _timerStatus: TimerStatus;
4646
private _targetRotation;
4747
private _rotations;
48-
private _roleIndex = [DRIVER, NAVIGATOR];
48+
private _roleIndex = [TYPER, NAVIGATOR];
4949

5050
constructor({
5151
id = generateId(),
@@ -70,8 +70,8 @@ export class Game {
7070

7171
// game.mob.getPlayers()
7272
// game.mob.names()
73-
// game.mob.getDriver()
74-
// game.mob.getDriver()
73+
// game.mob.getTyper()
74+
// game.mob.getTyper()
7575

7676
mob() {
7777
return this._mob;
@@ -117,12 +117,12 @@ export class Game {
117117
this._mob.push(new Player(name.trim(), avatar))
118118
}
119119

120-
driver() {
121-
return this.whoIs(this.indexOfDriver());
120+
typer() {
121+
return this.whoIs(this.indexOfTyper());
122122
}
123123

124-
private indexOfDriver() {
125-
return this._roleIndex.indexOf(DRIVER);
124+
private indexOfTyper() {
125+
return this._roleIndex.indexOf(TYPER);
126126
}
127127

128128
navigator() {
@@ -154,7 +154,7 @@ export class Game {
154154
}
155155

156156
positionOf(player: string) {
157-
if (this.driver() === player) return DRIVER;
157+
if (this.typer() === player) return TYPER;
158158
if (this.navigator() === player) return NAVIGATOR;
159159
return 'Mobber';
160160
}
@@ -191,10 +191,10 @@ export class Game {
191191
}
192192

193193
navigatorThenTyping() {
194-
this._roleIndex = [NAVIGATOR, DRIVER];
194+
this._roleIndex = [NAVIGATOR, TYPER];
195195
}
196196

197197
typingThenNavigator() {
198-
this._roleIndex = [DRIVER, NAVIGATOR];
198+
this._roleIndex = [TYPER, NAVIGATOR];
199199
}
200200
}

0 commit comments

Comments
 (0)