Merge pull request #134 from AlecM33/expand-game-e2e-tests

expand game e2e tests, remove auth for admin API in dev environment

server/modules/GameStateCurator.js

@@ -93,7 +93,9 @@ function getGameStateBasedOnPermissions (game, person, gameRunner) {
                 people: GameStateCurator.mapPeopleForModerator(game.people, client),
                 timerParams: game.timerParams,
                 isFull: game.isFull,
-                spectators: game.spectators
+                spectators: game.spectators.map((filteredPerson) =>
+                    GameStateCurator.mapPerson(filteredPerson)
+                )
             };
         case globals.USER_TYPES.TEMPORARY_MODERATOR:
             return {

server/modules/ServerBootstrapper.js

@@ -6,7 +6,6 @@ const fs = require('fs');
 const crypto = require('crypto');
 const SocketManager = require('./SocketManager.js');
 const GameManager = require('./GameManager.js');
-const globals = require('../config/globals.js');
 const { ENVIRONMENT } = require('../config/globals.js');
 const rateLimit = require('express-rate-limit').default;
 
@@ -145,14 +144,15 @@ const ServerBootstrapper = {
 };
 
 function isAuthorized (req) {
-    const KEY = process.env.NODE_ENV.trim() === 'development'
-        ? globals.MOCK_AUTH
-        : process.env.ADMIN_KEY;
+    if (process.env.NODE_ENV.trim() === 'development') {
+        return true;
+    }
+
     const header = req.headers.authorization;
     if (header) {
         const token = header.split(/\s+/).pop() || '';
         const decodedToken = Buffer.from(token, 'base64').toString();
-        return decodedToken.trim() === KEY?.trim();
+        return decodedToken.trim() === process.env.ADMIN_KEY?.trim();
     }
 
     return false;

spec/e2e/game_spec.js

@@ -77,7 +77,7 @@ describe('game page', () => {
         });
     });
 
-    describe('in-progress game', () => {
+    describe('in-progress game - player view', () => {
         let mockSocket;
 
         beforeEach(async () => {
@@ -144,6 +144,159 @@ describe('game page', () => {
             document.body.innerHTML = '';
         });
     });
+
+    describe('in-progress game - moderator view', () => {
+        let mockSocket;
+
+        beforeEach(async () => {
+            document.body.innerHTML = '';
+            mockSocket = {
+                eventHandlers: {},
+                on: function (message, handler) {
+                    this.eventHandlers[message] = handler;
+                },
+                emit: function (eventName, ...args) {
+                    switch (args[0]) { // eventName is currently always "inGameMessage" - the first arg after that is the specific message type
+                        case globals.EVENT_IDS.FETCH_GAME_STATE:
+                            args[args.length - 1](deepCopy(mockGames.moderatorGame)); // copy the game object to prevent leaking of state between specs
+                            break;
+                        case globals.EVENT_IDS.END_GAME:
+                            args[args.length - 1]();
+                            break;
+                        default:
+                            break;
+                    }
+                },
+                hasListeners: function (listener) {
+                    return false;
+                }
+            };
+            await gameHandler(mockSocket, XHRUtility, { location: { href: 'host/game/ABCD' } }, gameTemplate);
+            mockSocket.eventHandlers.connect();
+            mockSocket.eventHandlers.getTimeRemaining(120000, true);
+            spyOn(mockSocket, 'emit');
+        });
+
+        it('should display the button to play/pause the timer', () => {
+            expect(document.getElementById('play-pause')).not.toBeNull();
+        });
+
+        it('should intially have the play button displayed', () => {
+            expect(document.getElementById('play-pause').firstElementChild.getAttribute('src')).toEqual('../images/play-button.svg');
+        });
+
+        it('should display players by their alignment', () => {
+            expect(document.querySelector('.evil-players')).not.toBeNull();
+            expect(document.querySelector('.good-players')).not.toBeNull();
+            expect(document.querySelector('div[data-pointer="FCVSGJFYWLDL5S3Y8B74ZVZLZ"]')
+                .querySelector('.game-player-role').innerText).toEqual('Werewolf');
+        });
+
+        it('should display the mod transfer button', () => {
+            expect(document.getElementById('mod-transfer-button')).not.toBeNull();
+        });
+
+        it('should display the mod transfer modal, with the single spectator available for selection', () => {
+            document.getElementById('mod-transfer-button').click();
+            expect(document.querySelector('div[data-pointer="MGGVR8KQ7V7HGN3QBLJ5339ZL"].potential-moderator')
+                .innerText).toEqual('Matt');
+            document.getElementById('close-mod-transfer-modal-button').click();
+        });
+
+        it('should emit the appropriate socket event when killing a player, and indicate the result on the UI', () => {
+            document.querySelector('div[data-pointer="FCVSGJFYWLDL5S3Y8B74ZVZLZ"]')
+                .querySelector('.kill-player-button').click();
+            document.getElementById('confirmation-yes-button').click();
+            expect(mockSocket.emit).toHaveBeenCalledWith(
+                globals.SOCKET_EVENTS.IN_GAME_MESSAGE,
+                globals.EVENT_IDS.KILL_PLAYER,
+                mockGames.moderatorGame.accessCode,
+                { personId: 'FCVSGJFYWLDL5S3Y8B74ZVZLZ' }
+            );
+            mockSocket.eventHandlers.killPlayer('FCVSGJFYWLDL5S3Y8B74ZVZLZ');
+            expect(document.querySelector('div[data-pointer="FCVSGJFYWLDL5S3Y8B74ZVZLZ"].game-player.killed')
+            ).not.toBeNull();
+        });
+
+        it('should emit the appropriate socket event when revealing a player, and indicate the result on the UI', () => {
+            document.querySelector('div[data-pointer="FCVSGJFYWLDL5S3Y8B74ZVZLZ"]')
+                .querySelector('.reveal-role-button').click();
+            document.getElementById('confirmation-yes-button').click();
+            expect(mockSocket.emit).toHaveBeenCalledWith(
+                globals.SOCKET_EVENTS.IN_GAME_MESSAGE,
+                globals.EVENT_IDS.REVEAL_PLAYER,
+                mockGames.moderatorGame.accessCode,
+                { personId: 'FCVSGJFYWLDL5S3Y8B74ZVZLZ' }
+            );
+            mockSocket.eventHandlers.revealPlayer({ id: 'FCVSGJFYWLDL5S3Y8B74ZVZLZ', gameRole: 'Werewolf', alignment: 'evil' });
+            expect(document.querySelector('div[data-pointer="FCVSGJFYWLDL5S3Y8B74ZVZLZ"]')
+                .querySelector('.reveal-role-button')).toBeNull();
+        });
+
+        it('should emit the event to end the game, and display the result in the UI', () => {
+            document.getElementById('end-game-button').click();
+            document.getElementById('confirmation-yes-button').click();
+            expect(mockSocket.emit).toHaveBeenCalled();
+            mockSocket.eventHandlers.endGame([
+                {
+                    name: 'Greg',
+                    id: 'HVB3SK3XPGNSP34W2GVD5G3SP',
+                    userType: 'player',
+                    gameRole: 'Seer',
+                    gameRoleDescription: 'Each night, learn if a chosen person is a Werewolf.',
+                    alignment: 'good',
+                    out: false,
+                    revealed: true
+                },
+                {
+                    name: 'Lys',
+                    id: 'XJNHYX85HCKYDQLKYN584CRKK',
+                    userType: 'player',
+                    gameRole: 'Sorceress',
+                    gameRoleDescription: 'Each night, learn if a chosen person is the Seer.',
+                    alignment: 'evil',
+                    out: false,
+                    revealed: true
+                },
+                {
+                    name: 'Colette',
+                    id: 'MLTP5M76K6NN83VQBDTNC6ZP5',
+                    userType: 'player',
+                    gameRole: 'Parity Hunter',
+                    gameRoleDescription: 'You beat a werewolf in a 1v1 situation, winning the game for the village.',
+                    alignment: 'good',
+                    out: false,
+                    revealed: true
+                },
+                {
+                    name: 'Hannah',
+                    id: 'FCVSGJFYWLDL5S3Y8B74ZVZLZ',
+                    userType: 'killed',
+                    gameRole: 'Werewolf',
+                    gameRoleDescription: "During the night, choose a villager to kill. Don't get killed.",
+                    alignment: 'evil',
+                    out: true,
+                    revealed: true
+                },
+                {
+                    name: 'Andrea',
+                    id: 'VWLJ298FVTZR22R4TNCMRTB5B',
+                    userType: 'player',
+                    gameRole: 'Villager',
+                    gameRoleDescription: 'During the day, find the wolves and kill them.',
+                    alignment: 'good',
+                    out: false,
+                    revealed: true
+                }
+            ]);
+            expect(document.getElementById('end-of-game-header')).not.toBeNull();
+            expect(document.getElementById('restart-game')).not.toBeNull();
+        });
+
+        afterAll(() => {
+            document.body.innerHTML = '';
+        });
+    });
 });
 
 function deepCopy (object) {

spec/support/MockGames.js

@@ -164,5 +164,141 @@ export const mockGames = {
             timeRemaining: 120000
         },
         isFull: true
-    }
+    },
+    moderatorGame:
+        {
+            accessCode: 'LYG5',
+            status: 'in progress',
+            moderator: {
+                name: 'Alec',
+                id: 'F623SN7JJMV5QW8K9MNQWW4WP',
+                userType: 'moderator',
+                out: false,
+                revealed: false
+            },
+            client: {
+                name: 'Alec',
+                hasEnteredName: false,
+                id: 'F623SN7JJMV5QW8K9MNQWW4WP',
+                cookie: 'ZJ9RQDF6CNZKZQCSKP4WSHDHQ',
+                userType: 'moderator',
+                gameRole: null,
+                gameRoleDescription: null,
+                alignment: null,
+                out: false
+            },
+            deck: [
+                {
+                    role: 'Parity Hunter',
+                    team: 'good',
+                    description: 'You beat a werewolf in a 1v1 situation, winning the game for the village.',
+                    id: 'bfs9pwk81yu9k47ho4xyidzy7',
+                    quantity: 1
+                },
+                {
+                    role: 'Seer',
+                    team: 'good',
+                    description: 'Each night, learn if a chosen person is a Werewolf.',
+                    id: '0rob6qyg3eq7douedxen5pb44',
+                    quantity: 1
+                },
+                {
+                    role: 'Villager',
+                    team: 'good',
+                    description: 'During the day, find the wolves and kill them.',
+                    id: 'fq9n3u95ka16smbu6zaivnuvv',
+                    quantity: 1
+                },
+                {
+                    role: 'Sorceress',
+                    team: 'evil',
+                    description: 'Each night, learn if a chosen person is the Seer.',
+                    id: 'bwptvwzg0u1aao48045ht57wx',
+                    quantity: 1
+                },
+                {
+                    role: 'Werewolf',
+                    team: 'evil',
+                    description: "During the night, choose a villager to kill. Don't get killed.",
+                    id: 'c9gziuv8bon9bhmyuanfvecpd',
+                    quantity: 1
+                }
+            ],
+            gameSize: 5,
+            people: [
+                {
+                    name: 'Greg',
+                    id: 'HVB3SK3XPGNSP34W2GVD5G3SP',
+                    userType: 'player',
+                    gameRole: 'Seer',
+                    gameRoleDescription: 'Each night, learn if a chosen person is a Werewolf.',
+                    alignment: 'good',
+                    out: false,
+                    revealed: false
+                },
+                {
+                    name: 'Lys',
+                    id: 'XJNHYX85HCKYDQLKYN584CRKK',
+                    userType: 'player',
+                    gameRole: 'Sorceress',
+                    gameRoleDescription: 'Each night, learn if a chosen person is the Seer.',
+                    alignment: 'evil',
+                    out: false,
+                    revealed: false
+                },
+                {
+                    name: 'Colette',
+                    id: 'MLTP5M76K6NN83VQBDTNC6ZP5',
+                    userType: 'player',
+                    gameRole: 'Parity Hunter',
+                    gameRoleDescription: 'You beat a werewolf in a 1v1 situation, winning the game for the village.',
+                    alignment: 'good',
+                    out: false,
+                    revealed: false
+                },
+                {
+                    name: 'Hannah',
+                    id: 'FCVSGJFYWLDL5S3Y8B74ZVZLZ',
+                    userType: 'player',
+                    gameRole: 'Werewolf',
+                    gameRoleDescription: "During the night, choose a villager to kill. Don't get killed.",
+                    alignment: 'evil',
+                    out: false,
+                    revealed: false
+                },
+                {
+                    name: 'Andrea',
+                    id: 'VWLJ298FVTZR22R4TNCMRTB5B',
+                    userType: 'player',
+                    gameRole: 'Villager',
+                    gameRoleDescription: 'During the day, find the wolves and kill them.',
+                    alignment: 'good',
+                    out: false,
+                    revealed: false
+                }
+            ],
+            timerParams: {
+                hours: null,
+                minutes: 30,
+                paused: true,
+                timeRemaining: 1800000
+            },
+            isFull: true,
+            spectators: [
+                {
+                    id: 'MGGVR8KQ7V7HGN3QBLJ5339ZL',
+                    cookie: '9M2F677JBGWKCJBMXR54GBWWZ',
+                    socketId: '3RdkA19luMvUfVh2AAAP',
+                    name: 'Matt',
+                    userType: 'spectator',
+                    gameRole: null,
+                    gameRoleDescription: null,
+                    alignment: null,
+                    assigned: false,
+                    out: false,
+                    revealed: false,
+                    hasEnteredName: false
+                }
+            ]
+        }
 };