diff --git a/CHANGELOG.md b/CHANGELOG.md index d31ea2d3..dd7fafe1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ Special thanks to: @rejas, @sdetweil - Handle node_helper errors during startup (#2944) - Possibility to change FontAwesome class in calendar, so icons like `fab fa-facebook-square` works. - Fix cors problems with newsfeed articles (as far as possible), allow disabling cors per feed with option `useCorsProxy: false` (#2840) +- Tests not waiting for the application to start and stop before starting the next test ## [2.21.0] - 2022-10-01 diff --git a/js/app.js b/js/app.js index 2be62198..ae2d76f4 100644 --- a/js/app.js +++ b/js/app.js @@ -222,9 +222,9 @@ function App() { } } - loadModules(modules, function () { + loadModules(modules, async function () { httpServer = new Server(config); - const { app, io } = httpServer.open(); + const { app, io } = await httpServer.open(); Log.log("Server started ..."); const nodePromises = []; @@ -262,14 +262,16 @@ function App() { * exists. * * Added to fix #1056 + * + * @param {Function} callback Function to be called after the app has stopped */ - this.stop = function () { + this.stop = function (callback) { for (const nodeHelper of nodeHelpers) { if (typeof nodeHelper.stop === "function") { nodeHelper.stop(); } } - httpServer.close(); + httpServer.close().then(callback); }; /** diff --git a/js/server.js b/js/server.js index bd86219f..cb1b9e86 100644 --- a/js/server.js +++ b/js/server.js @@ -26,117 +26,133 @@ function Server(config) { const serverSockets = new Set(); let server = null; + /** + * Opens the server for incoming connections + * + * @returns {Promise} A promise that is resolved when the server listens to connections + */ this.open = function () { - if (config.useHttps) { - const options = { - key: fs.readFileSync(config.httpsPrivateKey), - cert: fs.readFileSync(config.httpsCertificate) - }; - server = require("https").Server(options, app); - } else { - server = require("http").Server(app); - } - const io = require("socket.io")(server, { - cors: { - origin: /.*$/, - credentials: true - }, - allowEIO3: true - }); + return new Promise((resolve) => { + if (config.useHttps) { + const options = { + key: fs.readFileSync(config.httpsPrivateKey), + cert: fs.readFileSync(config.httpsCertificate) + }; + server = require("https").Server(options, app); + } else { + server = require("http").Server(app); + } + const io = require("socket.io")(server, { + cors: { + origin: /.*$/, + credentials: true + }, + allowEIO3: true + }); - server.on("connection", (socket) => { - serverSockets.add(socket); - socket.on("close", () => { - serverSockets.delete(socket); + server.on("connection", (socket) => { + serverSockets.add(socket); + socket.on("close", () => { + serverSockets.delete(socket); + }); + }); + + Log.log(`Starting server on port ${port} ... `); + server.listen(port, config.address || "localhost"); + + if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) { + Log.warn(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs")); + } + + app.use(function (req, res, next) { + ipfilter(config.ipWhitelist, { mode: config.ipWhitelist.length === 0 ? "deny" : "allow", log: false })(req, res, function (err) { + if (err === undefined) { + res.header("Access-Control-Allow-Origin", "*"); + return next(); + } + Log.log(err.message); + res.status(403).send("This device is not allowed to access your mirror.
Please check your config.js or config.js.sample to change this."); + }); + }); + + app.use(helmet(config.httpHeaders)); + app.use("/js", express.static(__dirname)); + + // TODO add tests directory only when running tests? + const directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests/configs", "/tests/mocks"]; + for (const directory of directories) { + app.use(directory, express.static(path.resolve(global.root_path + directory))); + } + + app.get("/cors", async function (req, res) { + // example: http://localhost:8080/cors?url=https://google.de + + try { + const reg = "^/cors.+url=(.*)"; + let url = ""; + + let match = new RegExp(reg, "g").exec(req.url); + if (!match) { + url = "invalid url: " + req.url; + Log.error(url); + res.send(url); + } else { + url = match[1]; + Log.log("cors url: " + url); + const response = await fetch(url, { headers: { "User-Agent": "Mozilla/5.0 MagicMirror/" + global.version } }); + const header = response.headers.get("Content-Type"); + const data = await response.text(); + if (header) res.set("Content-Type", header); + res.send(data); + } + } catch (error) { + Log.error(error); + res.send(error); + } + }); + + app.get("/version", function (req, res) { + res.send(global.version); + }); + + app.get("/config", function (req, res) { + res.send(config); + }); + + app.get("/", function (req, res) { + let html = fs.readFileSync(path.resolve(`${global.root_path}/index.html`), { encoding: "utf8" }); + html = html.replace("#VERSION#", global.version); + + let configFile = "config/config.js"; + if (typeof global.configuration_file !== "undefined") { + configFile = global.configuration_file; + } + html = html.replace("#CONFIG_FILE#", configFile); + + res.send(html); + }); + + server.on("listening", () => { + resolve({ + app, + io + }); }); }); - - Log.log(`Starting server on port ${port} ... `); - server.listen(port, config.address || "localhost"); - - if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) { - Log.warn(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs")); - } - - app.use(function (req, res, next) { - ipfilter(config.ipWhitelist, { mode: config.ipWhitelist.length === 0 ? "deny" : "allow", log: false })(req, res, function (err) { - if (err === undefined) { - res.header("Access-Control-Allow-Origin", "*"); - return next(); - } - Log.log(err.message); - res.status(403).send("This device is not allowed to access your mirror.
Please check your config.js or config.js.sample to change this."); - }); - }); - - app.use(helmet(config.httpHeaders)); - app.use("/js", express.static(__dirname)); - - // TODO add tests directory only when running tests? - const directories = ["/config", "/css", "/fonts", "/modules", "/vendor", "/translations", "/tests/configs", "/tests/mocks"]; - for (const directory of directories) { - app.use(directory, express.static(path.resolve(global.root_path + directory))); - } - - app.get("/cors", async function (req, res) { - // example: http://localhost:8080/cors?url=https://google.de - - try { - const reg = "^/cors.+url=(.*)"; - let url = ""; - - let match = new RegExp(reg, "g").exec(req.url); - if (!match) { - url = "invalid url: " + req.url; - Log.error(url); - res.send(url); - } else { - url = match[1]; - Log.log("cors url: " + url); - const response = await fetch(url, { headers: { "User-Agent": "Mozilla/5.0 MagicMirror/" + global.version } }); - const header = response.headers.get("Content-Type"); - const data = await response.text(); - if (header) res.set("Content-Type", header); - res.send(data); - } - } catch (error) { - Log.error(error); - res.send(error); - } - }); - - app.get("/version", function (req, res) { - res.send(global.version); - }); - - app.get("/config", function (req, res) { - res.send(config); - }); - - app.get("/", function (req, res) { - let html = fs.readFileSync(path.resolve(`${global.root_path}/index.html`), { encoding: "utf8" }); - html = html.replace("#VERSION#", global.version); - - let configFile = "config/config.js"; - if (typeof global.configuration_file !== "undefined") { - configFile = global.configuration_file; - } - html = html.replace("#CONFIG_FILE#", configFile); - - res.send(html); - }); - - return { - app, - io - }; }; + /** + * Closes the server and destroys all lingering connections to it. + * + * @returns {Promise} A promise that resolves when server has successfully shut down + */ this.close = function () { - for (const socket of serverSockets.values()) { - socket.destroy(); - } - server.close(); + return new Promise((resolve) => { + for (const socket of serverSockets.values()) { + socket.destroy(); + } + server.close(resolve); + }); }; } diff --git a/tests/e2e/env_spec.js b/tests/e2e/env_spec.js index 27ddec2a..a62ab544 100644 --- a/tests/e2e/env_spec.js +++ b/tests/e2e/env_spec.js @@ -2,7 +2,7 @@ const helpers = require("./helpers/global-setup"); describe("App environment", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/default.js"); + await helpers.startApplication("tests/configs/default.js"); await helpers.getDocument(); }); afterAll(async () => { diff --git a/tests/e2e/fonts_spec.js b/tests/e2e/fonts_spec.js index 72966321..b0d642d0 100644 --- a/tests/e2e/fonts_spec.js +++ b/tests/e2e/fonts_spec.js @@ -13,8 +13,8 @@ describe("All font files from roboto.css should be downloadable", () => { match = regex.exec(fileContent); } - beforeAll(() => { - helpers.startApplication("tests/configs/without_modules.js"); + beforeAll(async () => { + await helpers.startApplication("tests/configs/without_modules.js"); }); afterAll(async () => { await helpers.stopApplication(); diff --git a/tests/e2e/helpers/global-setup.js b/tests/e2e/helpers/global-setup.js index 1b91fe37..7f60b40e 100644 --- a/tests/e2e/helpers/global-setup.js +++ b/tests/e2e/helpers/global-setup.js @@ -1,9 +1,10 @@ const jsdom = require("jsdom"); -const corefetch = require("fetch"); -exports.startApplication = (configFilename, exec) => { +exports.startApplication = async (configFilename, exec) => { jest.resetModules(); - this.stopApplication(); + if (global.app) { + await this.stopApplication(); + } // Set config sample for use in test if (configFilename === "") { process.env.MM_CONFIG_FILE = "config/config.js"; @@ -12,14 +13,20 @@ exports.startApplication = (configFilename, exec) => { } if (exec) exec; global.app = require("app.js"); - global.app.start(); + + return new Promise((resolve) => { + global.app.start(resolve); + }); }; exports.stopApplication = async () => { if (global.app) { - global.app.stop(); + return new Promise((resolve) => { + global.app.stop(resolve); + delete global.app; + }); } - await new Promise((resolve) => setTimeout(resolve, 100)); + return Promise.resolve(); }; exports.getDocument = () => { @@ -75,13 +82,8 @@ exports.waitForAllElements = (selector) => { }); }; -exports.fetch = (url) => { - return new Promise((resolve) => { - corefetch(url).then((res) => { - resolve(res); - }); - }); -}; +// When native fetch is used keep-alive is set which causes issues with tests that should not share the connection, fall back to use the older one for now... +exports.fetch = require("node-fetch"); exports.testMatch = async (element, regex) => { const elem = await this.waitForElement(element); diff --git a/tests/e2e/helpers/weather-functions.js b/tests/e2e/helpers/weather-functions.js index bca2bcde..5aa71c48 100644 --- a/tests/e2e/helpers/weather-functions.js +++ b/tests/e2e/helpers/weather-functions.js @@ -24,6 +24,6 @@ exports.startApp = async (configFile, additionalMockData) => { let content = fs.readFileSync(path.resolve(__dirname + "../../../../" + configFile)).toString(); content = content.replace("#####WEATHERDATA#####", mockWeather); fs.writeFileSync(path.resolve(__dirname + "../../../../config/config.js"), content); - helpers.startApplication(""); + await helpers.startApplication(""); await helpers.getDocument(); }; diff --git a/tests/e2e/ipWhitelist_spec.js b/tests/e2e/ipWhitelist_spec.js index 84251cac..4b3d3c0f 100644 --- a/tests/e2e/ipWhitelist_spec.js +++ b/tests/e2e/ipWhitelist_spec.js @@ -2,8 +2,8 @@ const helpers = require("./helpers/global-setup"); describe("ipWhitelist directive configuration", () => { describe("Set ipWhitelist without access", () => { - beforeAll(() => { - helpers.startApplication("tests/configs/noIpWhiteList.js"); + beforeAll(async () => { + await helpers.startApplication("tests/configs/noIpWhiteList.js"); }); afterAll(async () => { await helpers.stopApplication(); @@ -16,8 +16,8 @@ describe("ipWhitelist directive configuration", () => { }); describe("Set ipWhitelist []", () => { - beforeAll(() => { - helpers.startApplication("tests/configs/empty_ipWhiteList.js"); + beforeAll(async () => { + await helpers.startApplication("tests/configs/empty_ipWhiteList.js"); }); afterAll(async () => { await helpers.stopApplication(); diff --git a/tests/e2e/modules/alert_spec.js b/tests/e2e/modules/alert_spec.js index ce390a2b..c118e17e 100644 --- a/tests/e2e/modules/alert_spec.js +++ b/tests/e2e/modules/alert_spec.js @@ -2,7 +2,7 @@ const helpers = require("../helpers/global-setup"); describe("Alert module", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/alert/default.js"); + await helpers.startApplication("tests/configs/modules/alert/default.js"); await helpers.getDocument(); }); afterAll(async () => { diff --git a/tests/e2e/modules/calendar_spec.js b/tests/e2e/modules/calendar_spec.js index 729fc05f..e1bee78e 100644 --- a/tests/e2e/modules/calendar_spec.js +++ b/tests/e2e/modules/calendar_spec.js @@ -29,7 +29,7 @@ describe("Calendar module", () => { describe("Default configuration", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/calendar/default.js"); + await helpers.startApplication("tests/configs/modules/calendar/default.js"); await helpers.getDocument(); }); @@ -44,7 +44,7 @@ describe("Calendar module", () => { describe("Custom configuration", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/calendar/custom.js"); + await helpers.startApplication("tests/configs/modules/calendar/custom.js"); await helpers.getDocument(); }); @@ -67,7 +67,7 @@ describe("Calendar module", () => { describe("Recurring event", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/calendar/recurring.js"); + await helpers.startApplication("tests/configs/modules/calendar/recurring.js"); await helpers.getDocument(); }); @@ -83,7 +83,7 @@ describe("Calendar module", () => { Date.prototype.getTimezoneOffset = () => { return i * 60; }; - helpers.startApplication("tests/configs/modules/calendar/recurring.js"); + await helpers.startApplication("tests/configs/modules/calendar/recurring.js"); await helpers.getDocument(); }); @@ -95,7 +95,7 @@ describe("Calendar module", () => { describe("Changed port", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/calendar/changed-port.js"); + await helpers.startApplication("tests/configs/modules/calendar/changed-port.js"); serverBasicAuth.listen(8010); await helpers.getDocument(); }); @@ -111,7 +111,7 @@ describe("Calendar module", () => { describe("Basic auth", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/calendar/basic-auth.js"); + await helpers.startApplication("tests/configs/modules/calendar/basic-auth.js"); await helpers.getDocument(); }); @@ -122,7 +122,7 @@ describe("Calendar module", () => { describe("Basic auth by default", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/calendar/auth-default.js"); + await helpers.startApplication("tests/configs/modules/calendar/auth-default.js"); await helpers.getDocument(); }); @@ -133,7 +133,7 @@ describe("Calendar module", () => { describe("Basic auth backward compatibility configuration: DEPRECATED", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/calendar/old-basic-auth.js"); + await helpers.startApplication("tests/configs/modules/calendar/old-basic-auth.js"); await helpers.getDocument(); }); @@ -144,7 +144,7 @@ describe("Calendar module", () => { describe("Fail Basic auth", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/calendar/fail-basic-auth.js"); + await helpers.startApplication("tests/configs/modules/calendar/fail-basic-auth.js"); serverBasicAuth.listen(8020); await helpers.getDocument(); }); diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js index 93063470..4bdc4bcc 100644 --- a/tests/e2e/modules/clock_es_spec.js +++ b/tests/e2e/modules/clock_es_spec.js @@ -7,7 +7,7 @@ describe("Clock set to spanish language module", () => { describe("with default 24hr clock config", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/es/clock_24hr.js"); + await helpers.startApplication("tests/configs/modules/clock/es/clock_24hr.js"); await helpers.getDocument(); }); @@ -24,7 +24,7 @@ describe("Clock set to spanish language module", () => { describe("with default 12hr clock config", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/es/clock_12hr.js"); + await helpers.startApplication("tests/configs/modules/clock/es/clock_12hr.js"); await helpers.getDocument(); }); @@ -41,7 +41,7 @@ describe("Clock set to spanish language module", () => { describe("with showPeriodUpper config enabled", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/es/clock_showPeriodUpper.js"); + await helpers.startApplication("tests/configs/modules/clock/es/clock_showPeriodUpper.js"); await helpers.getDocument(); }); @@ -53,7 +53,7 @@ describe("Clock set to spanish language module", () => { describe("with showWeek config enabled", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/es/clock_showWeek.js"); + await helpers.startApplication("tests/configs/modules/clock/es/clock_showWeek.js"); await helpers.getDocument(); }); diff --git a/tests/e2e/modules/clock_spec.js b/tests/e2e/modules/clock_spec.js index 1c6b93f9..e91237b2 100644 --- a/tests/e2e/modules/clock_spec.js +++ b/tests/e2e/modules/clock_spec.js @@ -8,7 +8,7 @@ describe("Clock module", () => { describe("with default 24hr clock config", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/clock_24hr.js"); + await helpers.startApplication("tests/configs/modules/clock/clock_24hr.js"); await helpers.getDocument(); }); @@ -25,7 +25,7 @@ describe("Clock module", () => { describe("with default 12hr clock config", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/clock_12hr.js"); + await helpers.startApplication("tests/configs/modules/clock/clock_12hr.js"); await helpers.getDocument(); }); @@ -42,7 +42,7 @@ describe("Clock module", () => { describe("with showPeriodUpper config enabled", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/clock_showPeriodUpper.js"); + await helpers.startApplication("tests/configs/modules/clock/clock_showPeriodUpper.js"); await helpers.getDocument(); }); @@ -54,7 +54,7 @@ describe("Clock module", () => { describe("with displaySeconds config disabled", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/clock_displaySeconds_false.js"); + await helpers.startApplication("tests/configs/modules/clock/clock_displaySeconds_false.js"); await helpers.getDocument(); }); @@ -66,7 +66,7 @@ describe("Clock module", () => { describe("with showTime config disabled", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/clock_showTime.js"); + await helpers.startApplication("tests/configs/modules/clock/clock_showTime.js"); await helpers.getDocument(); }); @@ -78,7 +78,7 @@ describe("Clock module", () => { describe("with showWeek config enabled", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/clock_showWeek.js"); + await helpers.startApplication("tests/configs/modules/clock/clock_showWeek.js"); await helpers.getDocument(); }); @@ -98,7 +98,7 @@ describe("Clock module", () => { describe("with analog clock face enabled", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/clock/clock_analog.js"); + await helpers.startApplication("tests/configs/modules/clock/clock_analog.js"); await helpers.getDocument(); }); diff --git a/tests/e2e/modules/compliments_spec.js b/tests/e2e/modules/compliments_spec.js index f4e6bdd5..52d232e5 100644 --- a/tests/e2e/modules/compliments_spec.js +++ b/tests/e2e/modules/compliments_spec.js @@ -21,7 +21,7 @@ describe("Compliments module", () => { describe("Feature anytime in compliments module", () => { describe("Set anytime and empty compliments for morning, evening and afternoon ", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/compliments/compliments_anytime.js"); + await helpers.startApplication("tests/configs/modules/compliments/compliments_anytime.js"); await helpers.getDocument(); }); @@ -32,7 +32,7 @@ describe("Compliments module", () => { describe("Only anytime present in configuration compliments", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/compliments/compliments_only_anytime.js"); + await helpers.startApplication("tests/configs/modules/compliments/compliments_only_anytime.js"); await helpers.getDocument(); }); @@ -44,7 +44,7 @@ describe("Compliments module", () => { describe("remoteFile option", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/compliments/compliments_remote.js"); + await helpers.startApplication("tests/configs/modules/compliments/compliments_remote.js"); await helpers.getDocument(); }); diff --git a/tests/e2e/modules/helloworld_spec.js b/tests/e2e/modules/helloworld_spec.js index bff9296d..ecdcdf20 100644 --- a/tests/e2e/modules/helloworld_spec.js +++ b/tests/e2e/modules/helloworld_spec.js @@ -7,7 +7,7 @@ describe("Test helloworld module", () => { describe("helloworld set config text", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/helloworld/helloworld.js"); + await helpers.startApplication("tests/configs/modules/helloworld/helloworld.js"); await helpers.getDocument(); }); @@ -20,7 +20,7 @@ describe("Test helloworld module", () => { describe("helloworld default config text", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/helloworld/helloworld_default.js"); + await helpers.startApplication("tests/configs/modules/helloworld/helloworld_default.js"); await helpers.getDocument(); }); diff --git a/tests/e2e/modules/newsfeed_spec.js b/tests/e2e/modules/newsfeed_spec.js index 47442f58..bf3066e7 100644 --- a/tests/e2e/modules/newsfeed_spec.js +++ b/tests/e2e/modules/newsfeed_spec.js @@ -7,7 +7,7 @@ describe("Newsfeed module", () => { describe("Default configuration", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/newsfeed/default.js"); + await helpers.startApplication("tests/configs/modules/newsfeed/default.js"); await helpers.getDocument(); }); @@ -32,7 +32,7 @@ describe("Newsfeed module", () => { describe("Custom configuration", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/newsfeed/prohibited_words.js"); + await helpers.startApplication("tests/configs/modules/newsfeed/prohibited_words.js"); await helpers.getDocument(); }); @@ -51,7 +51,7 @@ describe("Newsfeed module", () => { describe("Invalid configuration", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/newsfeed/incorrect_url.js"); + await helpers.startApplication("tests/configs/modules/newsfeed/incorrect_url.js"); await helpers.getDocument(); }); @@ -64,7 +64,7 @@ describe("Newsfeed module", () => { describe("Ignore items", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/newsfeed/ignore_items.js"); + await helpers.startApplication("tests/configs/modules/newsfeed/ignore_items.js"); await helpers.getDocument(); }); diff --git a/tests/e2e/modules_display_spec.js b/tests/e2e/modules_display_spec.js index 94a0c069..15520d05 100644 --- a/tests/e2e/modules_display_spec.js +++ b/tests/e2e/modules_display_spec.js @@ -2,7 +2,7 @@ const helpers = require("./helpers/global-setup"); describe("Display of modules", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/display.js"); + await helpers.startApplication("tests/configs/modules/display.js"); await helpers.getDocument(); }); afterAll(async () => { diff --git a/tests/e2e/modules_empty_spec.js b/tests/e2e/modules_empty_spec.js index 5c84f8bf..ddd08e82 100644 --- a/tests/e2e/modules_empty_spec.js +++ b/tests/e2e/modules_empty_spec.js @@ -2,7 +2,7 @@ const helpers = require("./helpers/global-setup"); describe("Check configuration without modules", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/without_modules.js"); + await helpers.startApplication("tests/configs/without_modules.js"); await helpers.getDocument(); }); afterAll(async () => { diff --git a/tests/e2e/modules_position_spec.js b/tests/e2e/modules_position_spec.js index 3a661d7b..606c95a2 100644 --- a/tests/e2e/modules_position_spec.js +++ b/tests/e2e/modules_position_spec.js @@ -2,7 +2,7 @@ const helpers = require("./helpers/global-setup"); describe("Position of modules", () => { beforeAll(async () => { - helpers.startApplication("tests/configs/modules/positions.js"); + await helpers.startApplication("tests/configs/modules/positions.js"); await helpers.getDocument(); }); afterAll(async () => { diff --git a/tests/e2e/port_spec.js b/tests/e2e/port_spec.js index 71fd569c..104b9373 100644 --- a/tests/e2e/port_spec.js +++ b/tests/e2e/port_spec.js @@ -2,8 +2,8 @@ const helpers = require("./helpers/global-setup"); describe("port directive configuration", () => { describe("Set port 8090", () => { - beforeAll(() => { - helpers.startApplication("tests/configs/port_8090.js"); + beforeAll(async () => { + await helpers.startApplication("tests/configs/port_8090.js"); }); afterAll(async () => { await helpers.stopApplication(); @@ -16,8 +16,8 @@ describe("port directive configuration", () => { }); describe("Set port 8100 on environment variable MM_PORT", () => { - beforeAll(() => { - helpers.startApplication("tests/configs/port_8090.js", (process.env.MM_PORT = 8100)); + beforeAll(async () => { + await helpers.startApplication("tests/configs/port_8090.js", (process.env.MM_PORT = 8100)); }); afterAll(async () => { await helpers.stopApplication(); diff --git a/tests/e2e/vendor_spec.js b/tests/e2e/vendor_spec.js index 0db607d3..6a88983a 100644 --- a/tests/e2e/vendor_spec.js +++ b/tests/e2e/vendor_spec.js @@ -1,8 +1,8 @@ const helpers = require("./helpers/global-setup"); describe("Vendors", () => { - beforeAll(() => { - helpers.startApplication("tests/configs/default.js"); + beforeAll(async () => { + await helpers.startApplication("tests/configs/default.js"); }); afterAll(async () => { await helpers.stopApplication();