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
9 changes: 7 additions & 2 deletions src/core/reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,12 @@ export class ContextEnhancer {
* @param {...object} numPlayers - The number of players.
* @param {...object} multiplayer - Set to true if we are in a multiplayer client.
*/
export function CreateGameReducer({ game, numPlayers, multiplayer }) {
export function CreateGameReducer({
game,
numPlayers,
multiplayer,
setupData,
}) {
if (!numPlayers) {
numPlayers = 2;
}
Expand All @@ -124,7 +129,7 @@ export function CreateGameReducer({ game, numPlayers, multiplayer }) {
const apiCtx = new ContextEnhancer(ctx, game, ctx.currentPlayer);
let ctxWithAPI = apiCtx.attachToContext(ctx);

let initialG = game.setup(ctxWithAPI);
let initialG = game.setup(ctxWithAPI, setupData);
game.plugins.filter(plugin => plugin.setup !== undefined).forEach(plugin => {
initialG = plugin.setup(initialG, ctxWithAPI);
});
Expand Down
1 change: 1 addition & 0 deletions src/server/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ export const createApiServer = ({ db, games }) => {
const reducer = CreateGameReducer({
game,
numPlayers,
setupData: ctx.request.body.setupData,
});
const store = Redux.createStore(reducer);
const state = store.getState();
Expand Down
36 changes: 34 additions & 2 deletions src/server/api.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,17 @@ describe('.createApiServer', () => {
db = {
set: async (id, state) => setSpy(id, state),
};
games = [Game({ name: 'foo' })];
games = [
Game({
name: 'foo',
setup: (ctx, setupData) =>
setupData
? {
colors: setupData.colors,
}
: {},
}),
];
});

describe('for an unprotected lobby server', () => {
Expand All @@ -181,7 +191,15 @@ describe('.createApiServer', () => {

response = await request(app.callback())
.post('/games/foo/create')
.send('numPlayers=3');
.send({
numPlayers: 3,
setupData: {
colors: {
'0': 'green',
'1': 'red',
},
},
});
});

test('is successful', () => {
Expand All @@ -199,6 +217,20 @@ describe('.createApiServer', () => {
);
});

test('passes arbitrary data to game setup', () => {
expect(setSpy).toHaveBeenCalledWith(
expect.stringMatching('foo:'),
expect.objectContaining({
G: expect.objectContaining({
colors: {
'0': 'green',
'1': 'red',
},
}),
})
);
});

test('creates game metadata', () => {
expect(setSpy).toHaveBeenCalledWith(
expect.stringMatching(':metadata'),
Expand Down