Merge pull request #772 from gemini-testing/users/shadowusr/TRIVIAL.f…

…ix-ts-tests test: fix launching tests on typescript
gemini-testing · Jul 4, 2023 · 12f57f4 · 12f57f4
2 parents a1135e3 + cdfc623
commit 12f57f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/.mocharc.js b/.mocharc.js
@@ -2,5 +2,6 @@
 
 module.exports = {
     recursive: true,
+    extension: [".js", ".ts"],
     require: ["./test/setup", "./test/assert-ext", "./test/ts-node"],
 };
diff --git a/test/src/utils/typescript.ts b/test/src/utils/typescript.ts
@@ -1,20 +1,17 @@
 import proxyquire from "proxyquire";
 import sinon, { type SinonStub } from "sinon";
 import _ from "lodash";
-import * as process from "process";
 
 describe("utils/typescript", () => {
-    const processBackup = _.assign({}, process);
-    const processEnvBackup = _.assign({}, process.env);
+    const processEnvBackup = _.clone(process.env);
 
     let ts: typeof import("src/utils/typescript");
     let registerStub: SinonStub;
     const REGISTER_INSTANCE = Symbol("tsNodeTesting");
 
     beforeEach(() => {
         registerStub = sinon.stub();
-        ts = require("src/utils/typescript");
-        ts = proxyquire("src/utils/typescript", {
+        ts = proxyquire.noCallThru().load("src/utils/typescript", {
             "ts-node": {
                 register: registerStub,
                 REGISTER_INSTANCE,
@@ -24,7 +21,6 @@ describe("utils/typescript", () => {
 
     afterEach(() => {
         _.set(process, REGISTER_INSTANCE, undefined);
-        _.set(global, "process", processBackup);
         _.set(process, "env", processEnvBackup);
     });
 
@@ -53,7 +49,7 @@ describe("utils/typescript", () => {
         });
 
         it("should use swc if it is installed", () => {
-            ts = proxyquire("src/utils/typescript", {
+            ts = proxyquire.noCallThru().load("src/utils/typescript", {
                 "ts-node": {
                     register: registerStub,
                 },
@@ -71,7 +67,7 @@ describe("utils/typescript", () => {
         });
 
         it("should not use swc if not installed", () => {
-            ts = proxyquire("src/utils/typescript", {
+            ts = proxyquire.noCallThru().load("src/utils/typescript", {
                 "ts-node": {
                     register: registerStub,
                 },
@@ -83,13 +79,13 @@ describe("utils/typescript", () => {
             assert.calledOnceWith(
                 registerStub,
                 sinon.match({
-                    swc: undefined,
+                    swc: false,
                 }),
             );
         });
 
         it("should not throw if nothing is installed", () => {
-            ts = proxyquire("src/utils/typescript", {
+            ts = proxyquire.noCallThru().load("src/utils/typescript", {
                 "ts-node": null,
                 "@swc/core": null,
             });