test(babel): update babel tests

wessberg · wessberg · commit 2e50c53c521b · 2021-03-17T00:50:59.000+01:00
diff --git a/test/allowjs.test.ts b/test/allowjs.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript, {withTypeScriptVersions} from "./util/ts-macro";
+import {withTypeScript, withTypeScriptVersions} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/babel.test.ts b/test/babel.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {ConfigItem} from "@babel/core";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import {BABEL_CONFIG_JS_FILENAME, BABEL_CONFIG_JSON_FILENAME, BABELRC_FILENAME} from "../src/constant/constant";
@@ -150,7 +150,10 @@ test.serial("Can resolve a babel config file by file path. #1", withTypeScript,
 		throw ex;
 	} finally {
 		unlinker.cleanup();
-		t.true(configFileName != null && normalize(configFileName) === normalize(unlinker.path));
+		t.true(configFileName != null);
+		if (configFileName != null) {
+			t.deepEqual(normalize(configFileName), normalize(unlinker.path));
+		}
 	}
 });
 
@@ -189,7 +192,10 @@ test.serial("Can find a babel config with rootMode: 'upward'. #1", withTypeScrip
 		throw ex;
 	} finally {
 		unlinker.cleanup();
-		t.true(configFileName != null && normalize(configFileName) === normalize(unlinker.path));
+		t.true(configFileName != null);
+		if (configFileName != null) {
+			t.deepEqual(normalize(configFileName), normalize(unlinker.path));
+		}
 	}
 });
 
@@ -225,8 +231,11 @@ test.serial("Can resolve the nearest file-relative babel config. #1", withTypeSc
 		throw ex;
 	} finally {
 		unlinker.cleanup();
+
 		t.true(configFileName != null);
-		t.deepEqual(normalize(configFileName!), normalize(unlinker.path));
+		if (configFileName != null) {
+			t.deepEqual(normalize(configFileName), normalize(unlinker.path));
+		}
 	}
 });
 
diff --git a/test/build-info.test.ts b/test/build-info.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
 test("Can generate .tsbuildinfo for a compilation unit. #1", withTypeScript, async (t, {typescript}) => {
diff --git a/test/code-splitting.test.ts b/test/code-splitting.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import {stripKnownExtension} from "../src/util/path/path-util";
diff --git a/test/comment.test.ts b/test/comment.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/custom-transformers.test.ts b/test/custom-transformers.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import {TS} from "../src/type/ts";
diff --git a/test/declaration-map.test.ts b/test/declaration-map.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/declaration.test.ts b/test/declaration.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript, {withTypeScriptVersions} from "./util/ts-macro";
+import {withTypeScript, withTypeScriptVersions} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/deconflict.test.ts b/test/deconflict.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript, {withTypeScriptVersions} from "./util/ts-macro";
+import {withTypeScript, withTypeScriptVersions} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/diagnostic.test.ts b/test/diagnostic.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
 test("Will report diagnostics from the ParsedCommandLine. #1", withTypeScript, async (t, {typescript}) => {
diff --git a/test/entry-file-names.test.ts b/test/entry-file-names.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import {join, normalize} from "../src/util/path/path-util";
 
diff --git a/test/exclude.test.ts b/test/exclude.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/export-circular.test.ts b/test/export-circular.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/export-default.test.ts b/test/export-default.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/external.test.ts b/test/external.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/global-definition.test.ts b/test/global-definition.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/helpers.test.ts b/test/helpers.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript, {withTypeScriptVersions} from "./util/ts-macro";
+import {withTypeScript, withTypeScriptVersions} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import {formatCode} from "./util/format-code";
 
diff --git a/test/hook.test.ts b/test/hook.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import {DeclarationStats} from "../src/type/declaration-stats";
diff --git a/test/integration.test.ts b/test/integration.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import alias from "@rollup/plugin-alias";
 import {formatCode} from "./util/format-code";
diff --git a/test/json.test.ts b/test/json.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import json from "@rollup/plugin-json";
 import {formatCode} from "./util/format-code";
diff --git a/test/mjs.test.ts b/test/mjs.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import {formatCode} from "./util/format-code";
 
diff --git a/test/module.test.ts b/test/module.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/multi-entry.test.ts b/test/multi-entry.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import multiEntry from "@rollup/plugin-multi-entry";
 import {formatCode} from "./util/format-code";
diff --git a/test/namespace-export.test.ts b/test/namespace-export.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript, {withTypeScriptVersions} from "./util/ts-macro";
+import {withTypeScript, withTypeScriptVersions} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/parse-tsconfig.test.ts b/test/parse-tsconfig.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {generateRollupBundle} from "./setup/setup-rollup";
 import {formatCode} from "./util/format-code";
 
diff --git a/test/path-mapping.test.ts b/test/path-mapping.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/rebuild.test.ts b/test/rebuild.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/statement-merge.test.ts b/test/statement-merge.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/tree-shake.test.ts b/test/tree-shake.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/type-reference-directive.test.ts b/test/type-reference-directive.test.ts
@@ -1,5 +1,5 @@
 import test from "ava";
-import withTypeScript from "./util/ts-macro";
+import {withTypeScript} from "./util/ts-macro";
 import {formatCode} from "./util/format-code";
 import {generateRollupBundle} from "./setup/setup-rollup";
 
diff --git a/test/util/ts-macro.ts b/test/util/ts-macro.ts
@@ -60,4 +60,4 @@ export function withTypeScriptVersions(extraFilter: string): OneOrMoreMacros<[Ex
 	return filteredMacros as OneOrMoreMacros<[ExtendedImplementation], unknown>;
 }
 
-export default withTypeScriptVersions("*");
+export const withTypeScript = withTypeScriptVersions("*");
