From 8e74cef4a5b63ab14e47d8d698f804745c0c4ea6 Mon Sep 17 00:00:00 2001
From: Catalin Mititiuc
Date: Thu, 18 Apr 2024 10:01:26 -0700
Subject: Run server on different port when running tests
---
test/google.test.js | 18 ------------------
test/integration/page.test.js | 18 ++++++++++++++++++
test/integration/setup.cjs | 20 ++++++++++++++++++++
test/integration/teardown.cjs | 5 +++++
test/setup.cjs | 28 ----------------------------
test/teardown.cjs | 5 -----
6 files changed, 43 insertions(+), 51 deletions(-)
delete mode 100644 test/google.test.js
create mode 100644 test/integration/page.test.js
create mode 100644 test/integration/setup.cjs
create mode 100644 test/integration/teardown.cjs
delete mode 100644 test/setup.cjs
delete mode 100644 test/teardown.cjs
(limited to 'test')
diff --git a/test/google.test.js b/test/google.test.js
deleted file mode 100644
index 56729bf..0000000
--- a/test/google.test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const { Builder } = require('selenium-webdriver'),
- chrome = require('selenium-webdriver/chrome.js'),
- { expect, it } = require('@jest/globals'),
- chromeOptions = new chrome.Options();
-
-let driver;
-
-chromeOptions.addArguments('--headless', '--disable-gpu', '--no-sandbox');
-
-beforeAll(async () => {
- driver = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).build();
-});
-
-it('loads the page', async () => {
- await driver.get("http://localhost:8080");
-
- expect(await driver.getTitle()).toEqual('Infantry Combat Solo Basic');
-});
diff --git a/test/integration/page.test.js b/test/integration/page.test.js
new file mode 100644
index 0000000..7157bff
--- /dev/null
+++ b/test/integration/page.test.js
@@ -0,0 +1,18 @@
+const { Builder } = require('selenium-webdriver'),
+ chrome = require('selenium-webdriver/chrome.js'),
+ { expect, it } = require('@jest/globals'),
+ chromeOptions = new chrome.Options();
+
+let driver;
+
+chromeOptions.addArguments('--headless', '--disable-gpu', '--no-sandbox');
+
+beforeAll(async () => {
+ driver = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).build();
+});
+
+it('loads the page', async () => {
+ await driver.get("http://localhost:3005");
+
+ expect(await driver.getTitle()).toEqual('Infantry Combat Solo Basic');
+});
diff --git a/test/integration/setup.cjs b/test/integration/setup.cjs
new file mode 100644
index 0000000..c476077
--- /dev/null
+++ b/test/integration/setup.cjs
@@ -0,0 +1,20 @@
+console.log("\nSpawning server process...");
+const { spawn } = require("child_process");
+
+module.exports = async function () {
+ const child = spawn("node", ["dev-server.cjs", "--test"]);
+
+ child.stdout.on('data', (data) => {
+ console.log(`${data}`);
+ });
+
+ globalThis.__INTEG_TEST_SERVER_PID__ = child.pid;
+
+ child.stderr.on("data", (data) => {
+ const str = data.toString();
+ console.log("[server]", str);
+ if (str.includes("localhost:3005")) {
+ setTimeout(resolve, 200);
+ }
+ });
+};
diff --git a/test/integration/teardown.cjs b/test/integration/teardown.cjs
new file mode 100644
index 0000000..1872061
--- /dev/null
+++ b/test/integration/teardown.cjs
@@ -0,0 +1,5 @@
+console.log('Stopping server.')
+
+module.exports = function teardown() {
+ process.kill(globalThis.__INTEG_TEST_SERVER_PID__);
+};
diff --git a/test/setup.cjs b/test/setup.cjs
deleted file mode 100644
index 01551a7..0000000
--- a/test/setup.cjs
+++ /dev/null
@@ -1,28 +0,0 @@
-console.log("\nSpawning server process...");
-const { spawn } = require("child_process");
-
-module.exports = async function () {
- const child = spawn("node", ["dev-server.cjs"]);
-
- 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) => {
- const str = data.toString();
- console.log("[server]", str);
- if (str.includes("localhost:3005")) {
- setTimeout(resolve, 200);
- }
- });
-};
diff --git a/test/teardown.cjs b/test/teardown.cjs
deleted file mode 100644
index 1872061..0000000
--- a/test/teardown.cjs
+++ /dev/null
@@ -1,5 +0,0 @@
-console.log('Stopping server.')
-
-module.exports = function teardown() {
- process.kill(globalThis.__INTEG_TEST_SERVER_PID__);
-};
--
cgit v1.2.3