Added vitest | added dockerfile | wrote some tests

.dockerignore

@@ -0,0 +1,25 @@
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/.idea
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

.run/All Tests.run.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="All Tests" type="JavaScriptTestRunnerVitest" nameIsGenerated="true">
+    <node-interpreter value="project" />
+    <vitest-package value="$PROJECT_DIR$/pac-man-board-game/ClientApp/node_modules/vitest" />
+    <working-dir value="$PROJECT_DIR$" />
+    <vitest-options value="--environment happy-dom" />
+    <envs />
+    <scope-kind value="ALL" />
+    <method v="2" />
+  </configuration>
+</component>

global.json

@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "7.0.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
+  }
+}

pac-man-board-game/ClientApp/.gitignore

@@ -8,6 +8,7 @@
 
 # production
 /build
+/dist
 
 # misc
 .DS_Store

pac-man-board-game/ClientApp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pac_man_board_game",
-  "version": "0.1-Testing",
+  "version": "0.1.1",
   "private": true,
   "dependencies": {
     "@headlessui/react": "^1.7.14",
@@ -14,7 +14,6 @@
     "web-vitals": "^2.1.4"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.1",
     "@types/react": "^18.2.6",
     "@types/react-dom": "^18.2.4",
     "@vitejs/plugin-react": "^4.0.0",
@@ -27,13 +26,15 @@
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.32.2",
+    "happy-dom": "^9.20.1",
     "nan": "^2.17.0",
     "postcss": "^8.4.23",
     "tailwindcss": "^3.3.2",
     "typescript": "^5.0.4",
     "vite": "^4.3.6",
     "vite-plugin-svgr": "^3.2.0",
-    "vite-tsconfig-paths": "^4.2.0"
+    "vite-tsconfig-paths": "^4.2.0",
+    "vitest": "^0.31.1"
   },
   "resolutions": {
     "css-what": "^5.0.1",
@@ -44,7 +45,8 @@
     "dev": "vite",
     "build": "vite build",
     "serve": "vite preview",
-    "test": "cross-env CI=true react-scripts test --env=jsdom",
+    "test": "cross-env CI=true vitest",
+    "coverage": "vitest run --coverage",
     "lint": "eslint ./src/"
   },
   "eslintConfig": {

pac-man-board-game/ClientApp/src/components/gameBoard.tsx

@@ -2,28 +2,7 @@ import React, {useEffect, useState} from "react";
 import {Character, PacMan} from "../game/character";
 import findPossiblePositions from "../game/possibleMovesAlgorithm";
 import {TileType} from "../game/tileType";
-
+import {testMap} from "../game/map";
-/**
- * 0 = empty
- * 1 = wall
- * 2 = pellet
- * 3 = power pellet
- * 4 = ghost spawn
- * 5 = pacman spawn
- */
-const map: number[][] = [
-  [1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1],
-  [1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 1],
-  [1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1],
-  [1, 0, 1, 5, 1, 0, 1, 4, 1, 0, 1],
-  [1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1],
-  [0, 2, 0, 0, 0, 3, 0, 0, 0, 2, 0],
-  [1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1],
-  [1, 0, 1, 4, 1, 0, 1, 5, 1, 0, 1],
-  [1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1],
-  [1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 1],
-  [1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1],
-];
 
 interface BoardProps extends ComponentProps {
   characters: Character[],
@@ -58,7 +37,7 @@ const Board: Component<BoardProps> = (
 
   useEffect(() => {
     if (selectedCharacter && selectedDice) {
-      const possiblePositions = findPossiblePositions(map, selectedCharacter, selectedDice.value);
+      const possiblePositions = findPossiblePositions(testMap, selectedCharacter, selectedDice.value);
       setPossiblePositions(possiblePositions);
     } else {
       setPossiblePositions([]);
@@ -89,7 +68,7 @@ const Board: Component<BoardProps> = (
   return (
     <div className={`w-fit ${className}`}>
       {
-        map.map((row, rowIndex) =>
+        testMap.map((row, rowIndex) =>
           <div key={rowIndex} className={"flex"}>
             {
               row.map((tile, colIndex) =>

pac-man-board-game/ClientApp/src/game/map.ts

@@ -0,0 +1,21 @@
+/**
+ * 0 = empty
+ * 1 = wall
+ * 2 = pellet
+ * 3 = power pellet
+ * 4 = ghost spawn
+ * 5 = pacman spawn
+ */
+export const testMap: GameMap = [
+  [1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1],
+  [1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 1],
+  [1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1],
+  [1, 0, 1, 5, 1, 0, 1, 4, 1, 0, 1],
+  [1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1],
+  [0, 2, 0, 0, 0, 3, 0, 0, 0, 2, 0],
+  [1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 1],
+  [1, 0, 1, 4, 1, 0, 1, 5, 1, 0, 1],
+  [1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1],
+  [1, 2, 0, 0, 0, 2, 0, 0, 0, 2, 1],
+  [1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1],
+];

pac-man-board-game/ClientApp/src/game/possibleMovesAlgorithm.ts

@@ -7,13 +7,13 @@ import {Character} from "./character";
  * @param character The current position of the character
  * @param steps The number of steps the character can move
  */
-export default function findPossiblePositions(board: number[][], character: Character, steps: number): Position[] {
+export default function findPossiblePositions(board: GameMap, character: Character, steps: number): Position[] {
   const possiblePositions: Position[] = [];
   findPossibleRecursive(board, character.position, steps, possiblePositions, []);
   return possiblePositions;
 }
 
-function findPossibleRecursive(board: number[][], currentPos: Position, steps: number,
+function findPossibleRecursive(board: GameMap, currentPos: Position, steps: number,
                                possibleList: Position[], visitedTiles: Position[]): Position | null {
   if (isOutsideBoard(currentPos, board.length)) {
     addTeleportationTiles(board, currentPos, steps, possibleList, visitedTiles);

pac-man-board-game/ClientApp/src/types/types.d.ts

@@ -15,3 +15,5 @@ type SelectedDice = {
 };
 
 type Position = { x: number, y: number };
+
+type GameMap = number[][];

pac-man-board-game/ClientApp/src/websockets/WebSocketService.ts

@@ -22,6 +22,7 @@ export default class WebSocketService {
   }
 
   public open(): void {
+    if (typeof WebSocket === "undefined") return;
     this.ws = new WebSocket(this._url);
     if (this._onOpen) this.ws.onopen = this._onOpen;
     if (this._onReceive) this.ws.onmessage = this._onReceive;
@@ -65,7 +66,7 @@ export default class WebSocketService {
   }
 
   public isOpen(): boolean {
-    return this.ws?.readyState === WebSocket.OPEN;
+    return this.ws?.readyState === WebSocket?.OPEN;
   }
 
   set onOpen(onOpen: VoidFunction) {

pac-man-board-game/ClientApp/tests/App.test.tsx

@@ -1,7 +1,8 @@
 import React from "react";
 import {createRoot} from "react-dom/client";
 import {MemoryRouter} from "react-router-dom";
-import {App} from "./App";
+import {App} from "../src/App";
+import {it} from "vitest";
 
 it("renders without crashing", async () => {
   const div = document.createElement("div");

pac-man-board-game/ClientApp/tests/game/possibleMovesAlgorithm.test.ts

@@ -0,0 +1,59 @@
+import {test, expect, beforeEach} from "vitest";
+import possibleMovesAlgorithm from "../../src/game/possibleMovesAlgorithm";
+import {testMap} from "../../src/game/map";
+import {Character, PacMan} from "../../src/game/character";
+
+let pacMan: Character;
+
+beforeEach(() => {
+  pacMan = new PacMan("yellow", {x: 3, y: 3});
+});
+
+test("One from start, should return one position", () => {
+  const result = possibleMovesAlgorithm(testMap, pacMan, 1);
+  expect(result).toEqual([{x: 3, y: 2}]);
+  expect(result.length).toBe(1);
+});
+
+test("Two from start, should return one position", () => {
+  const result = possibleMovesAlgorithm(testMap, pacMan, 2);
+  expect(result).toEqual([{x: 3, y: 1}]);
+  expect(result.length).toBe(1);
+});
+
+test("Three from start, should return two positions", () => {
+  const result = possibleMovesAlgorithm(testMap, pacMan, 3);
+  arrayEquals(result, [{x: 2, y: 1}, {x: 4, y: 1}]);
+  expect(result.length).toBe(2);
+});
+
+test("Four from start, should return two positions", () => {
+  const result = possibleMovesAlgorithm(testMap, pacMan, 4);
+  arrayEquals(result, [{x: 1, y: 1}, {x: 5, y: 1}]);
+  expect(result.length).toBe(2);
+});
+
+test("Five from start, should return four positions", () => {
+  const result = possibleMovesAlgorithm(testMap, pacMan, 5);
+  arrayEquals(result, [{x: 5, y: 0}, {x: 6, y: 1}, {x: 1, y: 2}, {x: 5, y: 2}]);
+  expect(result.length).toBe(4);
+});
+
+test("Six from start, should return six positions", () => {
+  const result = possibleMovesAlgorithm(testMap, pacMan, 6);
+  arrayEquals(result, [{x: 1, y: 3}, {x: 0, y: 5}, {x: 5, y: 3}, {x: 7, y: 1}, {x: 10, y: 5}, {x: 5, y: 10}]);
+  expect(result.length).toBe(6);
+});
+
+test("Six from position [1,5], should return 14", () => {
+  pacMan.moveTo({x: 1, y: 5});
+  const result = possibleMovesAlgorithm(testMap, pacMan, 6);
+  // TODO add possible moves
+  expect(result.length).toBe(14);
+});
+
+function arrayEquals<T extends any[]>(result: T, expected: T, message?: string): void {
+  for (const item of expected) {
+    expect(result, message).toContainEqual(item);
+  }
+}

pac-man-board-game/ClientApp/tsconfig.json

@@ -12,10 +12,10 @@
     "target": "ESNext",
     "module": "ESNext",
     "lib": ["dom", "dom.iterable", "esnext"],
-    "types": ["vite/client", "vite-plugin-svgr/client", "jest"],
+    "types": ["vite/client", "vite-plugin-svgr/client"],
     "moduleResolution": "node",
   },
   "include": [
-    "src"
+    "src", "tests"
   ]
 }

pac-man-board-game/ClientApp/vite.config.ts

@@ -9,6 +9,10 @@ import {execSync} from "child_process";
 
 export default defineConfig({
   plugins: [react()],
+  test: {
+    globals: false,
+    environment: "happy-dom",
+  },
   server: {
     port: 3000,
     strictPort: true,

pac-man-board-game/Dockerfile

@@ -0,0 +1,28 @@
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
+WORKDIR /app
+EXPOSE 80
+EXPOSE 443
+
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+
+# Install Node.js TODO use node 18?
+RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+    && apt-get install -y \
+        nodejs \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /src
+COPY ["pac-man-board-game/pac-man-board-game.csproj", "pac-man-board-game/"]
+RUN dotnet restore "pac-man-board-game/pac-man-board-game.csproj"
+COPY . .
+WORKDIR "/src/pac-man-board-game"
+# TODO missing build files from frontend
+RUN dotnet build "pac-man-board-game.csproj" -c Release -o /app/build
+
+FROM build AS publish
+RUN dotnet publish "pac-man-board-game.csproj" -c Release -o /app/publish /p:UseAppHost=false
+
+FROM base AS final
+WORKDIR /app
+COPY --from=publish /app/publish .
+ENTRYPOINT ["dotnet", "pac-man-board-game.dll"]

pac-man-board-game/Properties/launchSettings.json

@@ -24,6 +24,16 @@
         "ASPNETCORE_ENVIRONMENT": "Development",
         "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
       }
+    },
+    "Docker": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
+      },
+      "launchUrl": "https://localhost:3000",
+      "useSSL": true
     }
   }
 }

pac-man-board-game/pac-man-board-game.csproj

@@ -12,6 +12,7 @@
         <SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
         <RootNamespace>pacMan</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
+        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     </PropertyGroup>
 
     <ItemGroup>
@@ -26,6 +27,9 @@
     <ItemGroup>
         <!-- Don't publish the SPA source files, but do show them in the project files list -->
         <Content Remove="$(SpaRoot)**" />
+        <Content Include="..\.dockerignore">
+          <Link>.dockerignore</Link>
+        </Content>
         <None Remove="$(SpaRoot)**" />
         <None Include="$(SpaRoot)**" Exclude="$(SpaRoot)node_modules\**" />
     </ItemGroup>
@@ -39,6 +43,7 @@
       <TypeScriptCompile Remove="ClientApp\src\game\tileMap.ts" />
       <TypeScriptCompile Remove="ClientApp\src\components\gameCanvas.tsx" />
       <TypeScriptCompile Remove="ClientApp\src\game\game.ts" />
+      <TypeScriptCompile Remove="ClientApp\src\App.test.tsx" />
     </ItemGroup>
 
     <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SpaRoot)node_modules') ">