fixes e2e tests (#3817)

- fix newsfeed and calendar e2e tests so they don't need `--forceExit`
anymore
- `--forceExit` should stay in test runs to avoid running until test
limit in case of errors
- remove mocking console, not needed anymore
- configFactory-stuff should not run in browser (otherwise we get errors
`[ReferenceError: exports is not defined]`)

tests/configs/default.js

@@ -1,16 +1,19 @@
-exports.configFactory = (options) => {
-	return Object.assign(
-		{
-			electronOptions: {
-				webPreferences: {
-					nodeIntegration: true,
-					enableRemoteModule: true,
-					contextIsolation: false
-				}
-			},
+if (typeof exports === "object") {
+	// running in nodejs (not in browser)
+	exports.configFactory = (options) => {
+		return Object.assign(
+			{
+				electronOptions: {
+					webPreferences: {
+						nodeIntegration: true,
+						enableRemoteModule: true,
+						contextIsolation: false
+					}
+				},
 
-			modules: []
-		},
-		options
-	);
-};
+				modules: []
+			},
+			options
+		);
+	};
+}

tests/e2e/helpers/global-setup.js

@@ -27,6 +27,7 @@ exports.startApplication = async (configFilename, exec) => {
 		process.env.MM_CONFIG_FILE = configFilename;
 	}
 	process.env.mmTestMode = "true";
+	process.setMaxListeners(0);
 	if (exec) exec;
 	global.app = require("../../../js/app");
 

tests/e2e/helpers/mock-console.js

@@ -1,31 +0,0 @@
-/**
- * Suppresses errors concerning web server already shut down.
- * @param {string} err The error message.
- */
-const mockError = (err) => {
-	if (
-		err.includes("ECONNREFUSED")
-		|| err.includes("ECONNRESET")
-		|| err.includes("socket hang up")
-		|| err.includes("exports is not defined")
-		|| err.includes("module is not defined")
-		|| err.includes("write EPIPE")
-		|| err.includes("AggregateError")
-		|| err.includes("ERR_SOCKET_CONNECTION_TIMEOUT")
-	) {
-		jest.fn();
-	} else {
-		console.dir(err);
-	}
-};
-
-global.console = {
-	log: jest.fn(),
-	dir: console.dir,
-	error: mockError,
-	warn: console.warn,
-	info: jest.fn(),
-	debug: console.debug
-};
-
-process.setMaxListeners(0);

tests/e2e/modules/newsfeed_spec.js

@@ -84,9 +84,7 @@ describe("Newsfeed module", () => {
 describe("Newsfeed module located in config directory", () => {
 	beforeAll(() => {
 		const baseDir = `${__dirname}/../../..`;
-		if (!fs.existsSync(`${baseDir}/config/newsfeed`)) {
-			fs.cpSync(`${baseDir}/modules/default/newsfeed`, `${baseDir}/config/newsfeed`, { recursive: true });
-		}
+		fs.cpSync(`${baseDir}/modules/default/newsfeed`, `${baseDir}/config/newsfeed`, { recursive: true });
 		process.env.MM_MODULES_DIR = "config";
 	});