| index : btroops | |
| Virtual board game-aid for BattleTroops, an infantry combat simulator wargame published by FASA in 1989. |
| aboutsummaryrefslogtreecommitdiff |
diff options
| author | Catalin Mititiuc <webdevcat@proton.me> | 2024-04-18 10:01:26 -0700 |
|---|---|---|
| committer | Catalin Mititiuc <webdevcat@proton.me> | 2024-04-18 10:05:21 -0700 |
| commit | 8e74cef4a5b63ab14e47d8d698f804745c0c4ea6 (patch) | |
| tree | 6fee17cb5c152ae584d4e81a7c941ee9d08588e9 | |
| parent | 23967fe2f5ae9fb6d6c8a2cbc29845531f7acece (diff) | |
Run server on different port when running tests
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | dev-server.cjs | 33 | ||||
| -rw-r--r-- | jest.config.cjs | 3 | ||||
| -rw-r--r-- | jest.config.integ.cjs | 6 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | test/integration/page.test.js (renamed from test/google.test.js) | 2 | ||||
| -rw-r--r-- | test/integration/setup.cjs (renamed from test/setup.cjs) | 10 | ||||
| -rw-r--r-- | test/integration/teardown.cjs (renamed from test/teardown.cjs) | 0 |
8 files changed, 32 insertions, 27 deletions
@@ -4,13 +4,13 @@ ## Start the dev server - docker run --rm --init -it -w /app -v $PWD:/app -p 8080:8080 node node dev-server.js + docker run --rm --init -it -v $PWD:/usr/src/app -p 8080:8080 btroops Visit `localhost:8080` to view. ## Run a test -You need chrome and chromedriver installed. The Dockerfile builds an image that does that. Then run the test with that image. +You need chrome and chromedriver installed to run the integration tests. The Dockerfile builds an image that does that. Then run the test with that image. `--network host` gives the container internet access. Necessary if tests make outside requests. diff --git a/dev-server.cjs b/dev-server.cjs index fc4da91..13b517a 100644 --- a/dev-server.cjs +++ b/dev-server.cjs @@ -1,13 +1,22 @@ -console.log('Starting server.'); +const { createServer } = require('esbuild-server'); +const server = createServer( + { + bundle: true, + entryPoints: ['src/index.js'], + }, + { + static: 'public', + ...(process.argv.slice(2).includes('--test')) && { port: 3005 } + } +); -require('esbuild-server') - .createServer( - { - bundle: true, - entryPoints: ['src/index.js'], - }, - { - static: 'public' - } - ) - .start(); +const buildStart = Date.now(); +server + .start() + .then(() => { + console.log(`Build completed in ${Date.now() - buildStart}ms`); + }) + .catch(() => { + console.error('Build failed'); + }); +console.log(`Development server running at ${server.url}`); diff --git a/jest.config.cjs b/jest.config.cjs new file mode 100644 index 0000000..0a2d032 --- /dev/null +++ b/jest.config.cjs @@ -0,0 +1,3 @@ +module.exports = { + testPathIgnorePatterns: ["/node_modules/", "test/integration"] +}; diff --git a/jest.config.integ.cjs b/jest.config.integ.cjs index 8336242..af5adf3 100644 --- a/jest.config.integ.cjs +++ b/jest.config.integ.cjs @@ -15,8 +15,8 @@ console.log("Jest config file read."); // }); module.exports = { - globalSetup: "./test/setup.cjs", - globalTeardown: "./test/teardown.cjs", - testPathIgnorePatterns: ["/node_modules/"], + globalSetup: "./test/integration/setup.cjs", + globalTeardown: "./test/integration/teardown.cjs", + testPathIgnorePatterns: ["/node_modules/", "test/unit"], testTimeout: 5000 }; diff --git a/package.json b/package.json index 84c1534..c76cae8 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "svg-pan-zoom": "github:webdevcat-me/svg-pan-zoom" }, "scripts": { + "start": "node dev-server.cjs", "test:integ": "jest --config jest.config.integ.cjs", "test": "jest" } diff --git a/test/google.test.js b/test/integration/page.test.js index 56729bf..7157bff 100644 --- a/test/google.test.js +++ b/test/integration/page.test.js @@ -12,7 +12,7 @@ beforeAll(async () => { }); it('loads the page', async () => { - await driver.get("http://localhost:8080"); + await driver.get("http://localhost:3005"); expect(await driver.getTitle()).toEqual('Infantry Combat Solo Basic'); }); diff --git a/test/setup.cjs b/test/integration/setup.cjs index 01551a7..c476077 100644 --- a/test/setup.cjs +++ b/test/integration/setup.cjs @@ -2,20 +2,12 @@ console.log("\nSpawning server process..."); const { spawn } = require("child_process"); module.exports = async function () { - const child = spawn("node", ["dev-server.cjs"]); + const child = spawn("node", ["dev-server.cjs", "--test"]); child.stdout.on('data', (data) => { console.log(`${data}`); }); - // child.stderr.on('data', (data) => { - // console.error(`stderr: ${data}`); - // }); - - // child.on('close', (code) => { - // console.log(`child process exited with code ${code}`); - // }); - globalThis.__INTEG_TEST_SERVER_PID__ = child.pid; child.stderr.on("data", (data) => { diff --git a/test/teardown.cjs b/test/integration/teardown.cjs index 1872061..1872061 100644 --- a/test/teardown.cjs +++ b/test/integration/teardown.cjs |