Merge pull request #583 from ioBroker/mocha-typescript-fix

Fix how mocha interacts with TypeScript
ioBroker · Sep 11, 2020 · 03e6f9e · 03e6f9e
2 parents 8877e81 + 09da085
commit 03e6f9e
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 * (AlCalzone) Make ESLint work in the admin directory, fix most resulting errors (fixes #576)
 * (AlCalzone) The year and name placeholders in the Apache License are now correctly replaced (fixes #578)
 * (AlCalzone) Added dependabot config for automated dependency updates with auto-merging (#582) · [Migration guide](docs/updates/20200910_dependabot.md)
+* (AlCalzone) Fixed how mocha interacts with TypeScript (#583)
 
 ## 1.27.0 (2020-09-06)
 * (AlCalzone) Add support for TypeScript+React in the Admin UI · [Migration guide](docs/updates/20200902_typescript_react_admin.md)

diff --git a/templates/index.ts b/templates/index.ts
@@ -32,6 +32,7 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [
 	{ name: "src/main.ts.ts", templateFunction: require("./src/main.ts") },
 	{ name: "test/integration.js.ts", templateFunction: require("./test/integration.js") },
 	{ name: "test/mocha.setup.js.ts", templateFunction: require("./test/mocha.setup.js") },
+	{ name: "test/mocharc.custom.ts", templateFunction: require("./test/mocharc.custom") },
 	{ name: "test/package.js.ts", templateFunction: require("./test/package.js") },
 	{ name: "test/tsconfig.json.ts", templateFunction: require("./test/tsconfig.json") },
 	{ name: "test/unit.js.ts", templateFunction: require("./test/unit.js") },
@@ -59,7 +60,6 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [
 	{ name: "_github/workflows/dependabot-auto-merge.yml.ts", templateFunction: require("./_github/workflows/dependabot-auto-merge.yml") },
 	{ name: "_github/workflows/test-and-release.yml.ts", templateFunction: require("./_github/workflows/test-and-release.yml") },
 	{ name: "_gitignore.ts", templateFunction: require("./_gitignore") },
-	{ name: "_mocharc.json.ts", templateFunction: require("./_mocharc.json") },
 	{ name: "_npmignore.ts", templateFunction: require("./_npmignore") },
 	{ name: "_prettierignore.ts", templateFunction: require("./_prettierignore") },
 	{ name: "_prettierrc.js.ts", templateFunction: require("./_prettierrc.js") },

diff --git a/templates/package.json.ts b/templates/package.json.ts
@@ -143,9 +143,9 @@ const templateFunction: TemplateFunction = async answers => {
 				${useReact ? `"watch:parcel": "parcel admin/src/index.tsx -d admin/build${useDevcontainer ? ` --hmr-port 1235` : ""}",` : ""}
 				"watch:ts": "tsc -p tsconfig.build.json --watch",
 				"watch": "npm run watch:ts",
-				"test:ts": "mocha src/**/*.test.ts",
+				"test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts",
 			`) : (`
-				"test:js": "mocha \\"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\\"",
+				"test:js": "mocha --config test/mocharc.custom.json \\"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\\"",
 			`)}
 			"test:package": "mocha test/package --exit",
 			"test:unit": "mocha test/unit --exit",

diff --git a/templates/_mocharc.json.ts → templates/test/mocharc.custom.ts b/templates/_mocharc.json.ts → templates/test/mocharc.custom.ts
@@ -1,5 +1,5 @@
 import * as JSON5 from "json5";
-import { TemplateFunction } from "../src/lib/createAdapter";
+import { TemplateFunction } from "../../src/lib/createAdapter";
 
 const templateFunction: TemplateFunction = answers => {
 
@@ -8,7 +8,7 @@ const templateFunction: TemplateFunction = answers => {
 	const template = `
 {
 	"require": [
-		"./test/mocha.setup.js",
+		"test/mocha.setup.js",
 ${useTypeScript ? (`
 		"ts-node/register",
 		"source-map-support/register",
@@ -27,5 +27,5 @@ ${useTypeScript ? (`
 	return JSON.stringify(JSON5.parse(template), null, 4);
 };
 
-templateFunction.customPath = ".mocharc.json";
+templateFunction.customPath = "test/mocharc.custom.json";
 export = templateFunction;
diff --git a/test/baselines/TS_Prettier/package.json b/test/baselines/TS_Prettier/package.json
@@ -27,7 +27,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.6",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
@@ -57,7 +57,7 @@
     "build": "npm run build:ts",
     "watch:ts": "tsc -p tsconfig.build.json --watch",
     "watch": "npm run watch:ts",
-    "test:ts": "mocha src/**/*.test.ts",
+    "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/...lines/adapter_JS_ES6Class_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json b/...lines/adapter_JS_ES6Class_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json
@@ -27,7 +27,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.6",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
@@ -43,7 +43,7 @@
   },
   "main": "main.js",
   "scripts": {
-    "test:js": "mocha \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"",
+    "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/...ces_SingleQuotes_Apache-2.0/.mocharc.json → ...uotes_Apache-2.0/test/mocharc.custom.json b/...ces_SingleQuotes_Apache-2.0/.mocharc.json → ...uotes_Apache-2.0/test/mocharc.custom.json
@@ -1,6 +1,6 @@
 {
     "require": [
-        "./test/mocha.setup.js"
+        "test/mocha.setup.js"
     ],
     "watch-files": [
         "!(node_modules|test)/**/*.test.js",

diff --git a/test/baselines/adapter_JS_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json b/test/baselines/adapter_JS_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json
@@ -27,7 +27,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.6",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
@@ -43,7 +43,7 @@
   },
   "main": "main.js",
   "scripts": {
-    "test:js": "mocha \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"",
+    "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/...ces_SingleQuotes_Apache-2.0/.mocharc.json → ...uotes_Apache-2.0/test/mocharc.custom.json b/...ces_SingleQuotes_Apache-2.0/.mocharc.json → ...uotes_Apache-2.0/test/mocharc.custom.json
@@ -1,6 +1,6 @@
 {
     "require": [
-        "./test/mocha.setup.js"
+        "test/mocha.setup.js"
     ],
     "watch-files": [
         "!(node_modules|test)/**/*.test.js",

diff --git a/test/baselines/adapter_TS_ES6Class_ESLint_Tabs_DoubleQuotes_MIT/package.json b/test/baselines/adapter_TS_ES6Class_ESLint_Tabs_DoubleQuotes_MIT/package.json
@@ -27,7 +27,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.6",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
@@ -54,7 +54,7 @@
     "build": "npm run build:ts",
     "watch:ts": "tsc -p tsconfig.build.json --watch",
     "watch": "npm run watch:ts",
-    "test:ts": "mocha src/**/*.test.ts",
+    "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/...SLint_Tabs_DoubleQuotes_MIT/.mocharc.json → ...DoubleQuotes_MIT/test/mocharc.custom.json b/...SLint_Tabs_DoubleQuotes_MIT/.mocharc.json → ...DoubleQuotes_MIT/test/mocharc.custom.json
@@ -1,6 +1,6 @@
 {
 	"require": [
-		"./test/mocha.setup.js",
+		"test/mocha.setup.js",
 		"ts-node/register",
 		"source-map-support/register"
 	],

diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json
@@ -27,7 +27,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.6",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
@@ -54,7 +54,7 @@
     "build": "npm run build:ts",
     "watch:ts": "tsc -p tsconfig.build.json --watch",
     "watch": "npm run watch:ts",
-    "test:ts": "mocha src/**/*.test.ts",
+    "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/.../baselines/adapter_TS_React/.mocharc.json → ...DoubleQuotes_MIT/test/mocharc.custom.json b/.../baselines/adapter_TS_React/.mocharc.json → ...DoubleQuotes_MIT/test/mocharc.custom.json
@@ -1,6 +1,6 @@
 {
 	"require": [
-		"./test/mocha.setup.js",
+		"test/mocha.setup.js",
 		"ts-node/register",
 		"source-map-support/register"
 	],

diff --git a/test/baselines/adapter_TS_React/package.json b/test/baselines/adapter_TS_React/package.json
@@ -38,7 +38,7 @@
     "@types/jquery": "^3.5.1",
     "@types/materialize-css": "^1.0.8",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/react": "^16.9.49",
     "@types/react-dom": "^16.9.8",
@@ -72,7 +72,7 @@
     "watch:parcel": "parcel admin/src/index.tsx -d admin/build",
     "watch:ts": "tsc -p tsconfig.build.json --watch",
     "watch": "npm run watch:ts",
-    "test:ts": "mocha src/**/*.test.ts",
+    "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/...SLint_Tabs_DoubleQuotes_MIT/.mocharc.json → ...adapter_TS_React/test/mocharc.custom.json b/...SLint_Tabs_DoubleQuotes_MIT/.mocharc.json → ...adapter_TS_React/test/mocharc.custom.json
@@ -1,6 +1,6 @@
 {
 	"require": [
-		"./test/mocha.setup.js",
+		"test/mocha.setup.js",
 		"ts-node/register",
 		"source-map-support/register"
 	],

diff --git a/test/baselines/contributors/package.json b/test/baselines/contributors/package.json
@@ -35,7 +35,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.6",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
@@ -62,7 +62,7 @@
     "build": "npm run build:ts",
     "watch:ts": "tsc -p tsconfig.build.json --watch",
     "watch": "npm run watch:ts",
-    "test:ts": "mocha src/**/*.test.ts",
+    "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/test/baselines/git_SSH/package.json b/test/baselines/git_SSH/package.json
@@ -27,7 +27,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.6",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
@@ -54,7 +54,7 @@
     "build": "npm run build:ts",
     "watch:ts": "tsc -p tsconfig.build.json --watch",
     "watch": "npm run watch:ts",
-    "test:ts": "mocha src/**/*.test.ts",
+    "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/test/baselines/keywords/package.json b/test/baselines/keywords/package.json
@@ -28,7 +28,7 @@
     "@types/chai-as-promised": "^7.1.3",
     "@types/gulp": "^4.0.6",
     "@types/mocha": "^8.0.3",
-    "@types/node": "^14.10.0",
+    "@types/node": "^14.10.1",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^9.0.5",
     "@types/sinon-chai": "^3.2.4",
@@ -55,7 +55,7 @@
     "build": "npm run build:ts",
     "watch:ts": "tsc -p tsconfig.build.json --watch",
     "watch": "npm run watch:ts",
-    "test:ts": "mocha src/**/*.test.ts",
+    "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts",
     "test:package": "mocha test/package --exit",
     "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",

diff --git a/...baselines/vis_Widget_Travis/.mocharc.json → ...lines/vis_Widget/test/mocharc.custom.json b/...baselines/vis_Widget_Travis/.mocharc.json → ...lines/vis_Widget/test/mocharc.custom.json
@@ -1,6 +1,6 @@
 {
 	"require": [
-		"./test/mocha.setup.js"
+		"test/mocha.setup.js"
 	],
 	"watch-files": [
 		"!(node_modules|test)/**/*.test.js",

diff --git a/test/baselines/vis_Widget/.mocharc.json → ...is_Widget_Travis/test/mocharc.custom.json b/test/baselines/vis_Widget/.mocharc.json → ...is_Widget_Travis/test/mocharc.custom.json
@@ -1,6 +1,6 @@
 {
 	"require": [
-		"./test/mocha.setup.js"
+		"test/mocha.setup.js"
 	],
 	"watch-files": [
 		"!(node_modules|test)/**/*.test.js",