Skip to content

Commit d5cbeaa

Browse files
committed
f Navigator -> Talking
1 parent 501091d commit d5cbeaa

File tree

11 files changed

+58
-58
lines changed

11 files changed

+58
-58
lines changed

webapp/src/Badge.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export function Badge({ role }: any) {
55
function badgeSource(role: Role) {
66
const images = {
77
Typing: "driver-badge.png",
8-
Navigator: "navigator-badge.png",
8+
Talking: "navigator-badge.png",
99
Mobber: "mobber-badge.png",
1010
Researcher: "researcher-badge.png",
1111
Sponsor: "sponsor-badge.png",

webapp/src/Help.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export function Help({game, timeIsOver, onClose}) {
99
<h2>Time is over</h2>
1010
<h3 title="Next Typing"><span className="yellow">{game.typer()}</span>, you're the next Typing
1111
</h3>
12-
<h3 title="Next Navigator"><span className="yellow">{game.navigator()}</span>, you're the next
13-
Navigator</h3>
12+
<h3 title="Next Talking"><span className="yellow">{game.navigator()}</span>, you're the next
13+
Talking</h3>
1414
</>
1515
}
1616
{!timeIsOver &&

webapp/src/MobProgrammingRPG.integration.spec.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ describe('Mob Programming RPG', () => {
5757
client2
5858
] = await renderTwoGameClients(makeGame());
5959

60-
expectPlayerPositions(client1, ['Typing', 'Navigator', 'Mobber']);
61-
expectPlayerPositions(client2, ['Typing', 'Navigator', 'Mobber']);
60+
expectPlayerPositions(client1, ['Typing', 'Talking', 'Mobber']);
61+
expectPlayerPositions(client2, ['Typing', 'Talking', 'Mobber']);
6262
});
6363

6464
itButNotOnOurCi('two game clients with the same init game - same positions after rotation', async () => {
@@ -70,8 +70,8 @@ describe('Mob Programming RPG', () => {
7070
await startTimer(client1);
7171
await waitForRotation();
7272

73-
expectPlayerPositions(client1, ['Mobber', 'Typing', 'Navigator']);
74-
expectPlayerPositions(client2, ['Mobber', 'Typing', 'Navigator']);
73+
expectPlayerPositions(client1, ['Mobber', 'Typing', 'Talking']);
74+
expectPlayerPositions(client2, ['Mobber', 'Typing', 'Talking']);
7575
});
7676

7777
async function renderTwoGameClients(game: Game) {

webapp/src/MobProgrammingRPG.spec.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ describe('Mob Programming RPG', () => {
171171
// role has two contexts: testing framework, the game player
172172
expect(within(items[0]).getAllByRole('heading', { level: 2 })[0]).toHaveTextContent('Mobber')
173173
expect(within(items[1]).getAllByRole('heading', { level: 2 })[0]).toHaveTextContent('Typing')
174-
expect(within(items[2]).getAllByRole('heading', { level: 2 })[0]).toHaveTextContent('Navigator')
174+
expect(within(items[2]).getAllByRole('heading', { level: 2 })[0]).toHaveTextContent('Talking')
175175
})
176176

177177
it("has a help button once clicked shows what a player should do", () => {
@@ -237,7 +237,7 @@ describe('Mob Programming RPG', () => {
237237
expect(screen.getByTitle("timer")).toHaveTextContent('10:00');
238238
})
239239

240-
it('that allows to change rotation direction (Navigator -> Typing) <-> (Typing -> Navigator)', () => {
240+
it('that allows to change rotation direction (Talking -> Typing) <-> (Typing -> Talking)', () => {
241241
render(<MobProgrammingRPG />);
242242
fireEvent.click(getSettingsButton());
243243

@@ -248,7 +248,7 @@ describe('Mob Programming RPG', () => {
248248
expect(getButton({ name: GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER })).toBeInTheDocument();
249249
})
250250

251-
it('that allows to change rotation direction to (Navigator,Typing)', () => {
251+
it('that allows to change rotation direction to (Talking,Typing)', () => {
252252
const game = new Game({players:["Gregor", "Peter", "Rita"]});
253253
jest.spyOn(game, "navigatorThenTyping");
254254
render(<MobProgrammingRPG initGame={game} />);
@@ -260,7 +260,7 @@ describe('Mob Programming RPG', () => {
260260
expect(game.navigatorThenTyping).toHaveBeenCalledTimes(1);
261261
})
262262

263-
it('that allows to change rotation direction back to (Typing,Navigator)', () => {
263+
it('that allows to change rotation direction back to (Typing,Talking)', () => {
264264
const game = new Game({players:["Gregor", "Peter", "Rita"]});
265265
jest.spyOn(game, "navigatorThenTyping");
266266
jest.spyOn(game, "typingThenNavigator");
@@ -374,8 +374,8 @@ describe('Mob Programming RPG', () => {
374374
expect(screen.getByText("Time is over")).toBeInTheDocument();
375375
expect(screen.getByTitle("Next Typing")).toHaveTextContent("Peter");
376376
expect(screen.getByTitle("Next Typing")).toHaveTextContent("Typing");
377-
expect(screen.getByTitle("Next Navigator")).toHaveTextContent("Rita");
378-
expect(screen.getByTitle("Next Navigator")).toHaveTextContent("Navigator");
377+
expect(screen.getByTitle("Next Talking")).toHaveTextContent("Rita");
378+
expect(screen.getByTitle("Next Talking")).toHaveTextContent("Talking");
379379
})
380380

381381
it("that allows to continue after the time is over", () => {

webapp/src/PlayerDisplay.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ describe('PlayerDisplay', () => {
5757
}
5858

5959
roleInitialized('Typing');
60-
roleInitialized('Navigator');
60+
roleInitialized('Talking');
6161
roleInitialized('Mobber');
6262
});
6363

@@ -94,10 +94,10 @@ describe('PlayerDisplay', () => {
9494

9595
it('can select a new role after earning a badge', () => {
9696
render(<PlayerDisplay player={new Player("Roger")} />);
97-
player.clickAddPoints("Navigator");
97+
player.clickAddPoints("Talking");
9898
player.enterAddPointsForm("3");
9999

100-
expect(screen.getByAltText('Navigator Badge')).toBeInTheDocument();
100+
expect(screen.getByAltText('Talking Badge')).toBeInTheDocument();
101101
expect(screen.getByRole('listitem', { name: /Roger/i })).toBeInTheDocument();
102102

103103
const availableRoles = screen.getByLabelText(/available roles/i);

webapp/src/RoleSheet.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ describe('RoleSheet', () => {
1212
roles["Typing"].todos.forEach(todo => expect(screen.getByText(todo)).toBeInTheDocument())
1313
});
1414

15-
it(`shows Navigator skills when in Navigator position`, () => {
16-
render(<RoleSheet role="Navigator" position="Navigator" player={new Player("Roger")} scorePoints={() => { }} />);
15+
it(`shows Talking skills when in Talking position`, () => {
16+
render(<RoleSheet role="Talking" position="Talking" player={new Player("Roger")} scorePoints={() => { }} />);
1717

18-
roles["Navigator"].todos.forEach(todo => expect(screen.getByText(todo)).toBeInTheDocument())
18+
roles["Talking"].todos.forEach(todo => expect(screen.getByText(todo)).toBeInTheDocument())
1919
});
2020

2121
it(`shows Mobber skills when in Mobber position`, () => {

webapp/src/RoleSheet.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function RoleSheet({
3232
<EarnPointsForRole role={role} scorePoints={scorePoints} />
3333
<div>
3434
{role == "Typing" && position == "Typing" && roles[role].todos.map(s => <div key={s}>{s}</div>)}
35-
{role == "Navigator" && position == "Navigator" && roles[role].todos.map(s => <div key={s}>{s}</div>)}
35+
{role == "Talking" && position == "Talking" && roles[role].todos.map(s => <div key={s}>{s}</div>)}
3636
{role == "Mobber" && position == "Mobber" && roles[role].todos.map(s => <div key={s}>{s}</div>)}
3737
</div>
3838
{/*

webapp/src/model/Game.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ describe('Game', () => {
131131
expect(game.navigator()).toEqual('Rita');
132132
expect(game.next()).toEqual('Peter');
133133
expect(game.positionOf('Max')).toEqual('Typing');
134-
expect(game.positionOf('Rita')).toEqual('Navigator');
134+
expect(game.positionOf('Rita')).toEqual('Talking');
135135
expect(game.positionOf('Peter')).toEqual('Mobber');
136136
});
137137

138-
it('set the direction of roles: Navigator, Typing', () => {
138+
it('set the direction of roles: Talking, Typing', () => {
139139
const game = createGame();
140140
game.setPlayers('Max,Rita,Peter');
141141

@@ -145,11 +145,11 @@ describe('Game', () => {
145145
expect(game.navigator()).toEqual('Max');
146146
expect(game.next()).toEqual('Peter');
147147
expect(game.positionOf('Rita')).toEqual('Typing');
148-
expect(game.positionOf('Max')).toEqual('Navigator');
148+
expect(game.positionOf('Max')).toEqual('Talking');
149149
expect(game.positionOf('Peter')).toEqual('Mobber');
150150
});
151151

152-
it('set the direction of roles: Typing, Navigator', () => {
152+
it('set the direction of roles: Typing, Talking', () => {
153153
const game = createGame();
154154
game.setPlayers('Max,Rita,Peter');
155155
game.navigatorThenTyping();
@@ -160,7 +160,7 @@ describe('Game', () => {
160160
expect(game.navigator()).toEqual('Rita');
161161
expect(game.next()).toEqual('Peter');
162162
expect(game.positionOf('Max')).toEqual('Typing');
163-
expect(game.positionOf('Rita')).toEqual('Navigator');
163+
expect(game.positionOf('Rita')).toEqual('Talking');
164164
expect(game.positionOf('Peter')).toEqual('Mobber');
165165
});
166166

@@ -212,7 +212,7 @@ describe('Game', () => {
212212
expect(game.typer()).toEqual('Rita');
213213
expect(game.navigator()).toEqual('Peter');
214214
expect(game.positionOf('Rita')).toEqual('Typing');
215-
expect(game.positionOf('Peter')).toEqual('Navigator');
215+
expect(game.positionOf('Peter')).toEqual('Talking');
216216
expect(game.positionOf('Sam')).toEqual('Mobber');
217217
expect(game.positionOf('Max')).toEqual('Mobber');
218218
});
@@ -228,7 +228,7 @@ describe('Game', () => {
228228
expect(game.typer()).toEqual('Rita');
229229
expect(game.navigator()).toEqual('Peter');
230230
expect(game.positionOf('Rita')).toEqual('Typing');
231-
expect(game.positionOf('Peter')).toEqual('Navigator');
231+
expect(game.positionOf('Peter')).toEqual('Talking');
232232
expect(game.positionOf('Sam')).toEqual('Mobber');
233233
expect(game.positionOf('Max')).toEqual('Mobber');
234234
});
@@ -254,7 +254,7 @@ describe('Game', () => {
254254
expect(game.typer()).toEqual('Peter');
255255
expect(game.navigator()).toEqual('Rita');
256256
expect(game.positionOf('Peter')).toEqual('Typing');
257-
expect(game.positionOf('Rita')).toEqual('Navigator');
257+
expect(game.positionOf('Rita')).toEqual('Talking');
258258
expect(game.positionOf('Sam')).toEqual('Mobber');
259259
expect(game.positionOf('Max')).toEqual('Mobber');
260260
});
@@ -287,7 +287,7 @@ describe('Game', () => {
287287
"roles": {
288288
"Mobber": 3,
289289
"Typing": 0,
290-
"Navigator": 0,
290+
"Talking": 0,
291291
"Researcher": 0
292292
},
293293
"badges": ["Mobber"]

webapp/src/model/Game.ts

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

33
const TYPER = "Typing";
4-
const NAVIGATOR = "Navigator";
5-
export const GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR: string = "Typing,Navigator"
6-
export const GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER: string = "Navigator,Typing"
4+
const NAVIGATOR = "Talking";
5+
export const GAMEPLAY_ORDER_TYPER_THEN_NAVIGATOR: string = "Typing,Talking"
6+
export const GAMEPLAY_ORDER_NAVIGATOR_THEN_TYPER: string = "Talking,Typing"
77

88
export type GameId = string;
99
type Seconds = number;

webapp/src/model/Player.spec.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ describe('Player', () => {
1515
expect(player.avatar).toEqual('dodo');
1616
expectRolesAndPoints([
1717
['Typing', 0],
18-
['Navigator', 0],
18+
['Talking', 0],
1919
['Mobber', 0],
2020
]);
2121
expectPercentage([
2222
['Typing', 0],
23-
['Navigator', 0],
23+
['Talking', 0],
2424
['Mobber', 0],
2525
])
2626
});
@@ -38,28 +38,28 @@ describe('Player', () => {
3838
expect(player.level()).toBe(0);
3939
expectRolesAndPoints([
4040
['Typing', 1],
41-
['Navigator', 0],
41+
['Talking', 0],
4242
['Mobber', 0],
4343
]);
4444
expectPercentage([
4545
['Typing', 33.3],
46-
['Navigator', 0],
46+
['Talking', 0],
4747
['Mobber', 0],
4848
])
4949
});
5050

51-
it('scores two times as Navigator', () => {
52-
player.scoreTimes('Navigator', 2);
51+
it('scores two times as Talking', () => {
52+
player.scoreTimes('Talking', 2);
5353

5454
expect(player.badges).toEqual([]);
5555
expectRolesAndPoints([
5656
['Typing', 0],
57-
['Navigator', 2],
57+
['Talking', 2],
5858
['Mobber', 0],
5959
]);
6060
expectPercentage([
6161
['Typing', 0],
62-
['Navigator', 66.6],
62+
['Talking', 66.6],
6363
['Mobber', 0],
6464
])
6565
});
@@ -74,25 +74,25 @@ describe('Player', () => {
7474
expect(player.level()).toBe(1);
7575
expectRolesAndPoints([
7676
['Typing', 0],
77-
['Navigator', 0],
77+
['Talking', 0],
7878
['Mobber', 3],
7979
]);
8080
expectPercentage([
8181
['Typing', 0],
82-
['Navigator', 0],
82+
['Talking', 0],
8383
['Mobber', 100],
8484
])
8585
});
8686

8787
it('earns all level 1 Badges', () => {
8888
player.scoreTimes('Mobber', 3);
8989
player.scoreTimes('Typing', 3);
90-
player.scoreTimes('Navigator', 3);
90+
player.scoreTimes('Talking', 3);
9191

92-
expect(player.badges).toEqual(expect.arrayContaining(['Mobber', 'Typing', 'Navigator']));
92+
expect(player.badges).toEqual(expect.arrayContaining(['Mobber', 'Typing', 'Talking']));
9393
expectRolesAndPoints([
9494
['Typing', 3],
95-
['Navigator', 3],
95+
['Talking', 3],
9696
['Mobber', 3],
9797
]);
9898
});
@@ -164,7 +164,7 @@ describe('Player', () => {
164164
roles: {
165165
"Mobber": 3,
166166
"Typing": 0,
167-
"Navigator": 0,
167+
"Talking": 0,
168168
"Researcher": 0
169169
},
170170
badges: ["Mobber"]
@@ -180,7 +180,7 @@ describe('Player', () => {
180180
roles: {
181181
"Mobber": 3,
182182
"Typing": 0,
183-
"Navigator": 0,
183+
"Talking": 0,
184184
"Researcher": 0
185185
},
186186
badges: ["Mobber"]
@@ -192,7 +192,7 @@ describe('Player', () => {
192192
expect(player.roles).toEqual([
193193
"Mobber",
194194
"Typing",
195-
"Navigator",
195+
"Talking",
196196
"Researcher"
197197
])
198198
expect(player.pointsFor("Mobber")).toEqual(3)

0 commit comments

Comments
 (0)