Revert "MISC: fix typing conflict between jest and cypress"

test/cypress/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "compilerOptions": {
-    "esModuleInterop": true,
-    "isolatedModules": true,
-    "module": "commonjs",
-    "noEmit": true,
-    "strict": true,
-    "target": "es6",
-    "types": ["cypress", "@testing-library/cypress"]
-  }
-}

test/jest/Netscript/DynamicRamCalculation.test.js

@@ -1,3 +1,5 @@
+import { jest, describe, expect } from "@jest/globals";
+
 import { Player } from "../../../src/Player";
 import { NetscriptFunctions } from "../../../src/NetscriptFunctions";
 import { getRamCost, RamCostConstants } from "../../../src/Netscript/RamCostGenerator";

test/jest/Netscript/StaticRamCalculation.test.js

@@ -1,3 +1,5 @@
+import { jest, describe, expect } from "@jest/globals";
+
 import { Player } from "../../../src/Player";
 import { getRamCost, RamCostConstants } from "../../../src/Netscript/RamCostGenerator";
 import { calculateRamUsage } from "../../../src/Script/RamCalculations";

test/jest/Netscript/StaticRamParsingCalculation.test.js

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { describe, expect, jest } from "@jest/globals";
+
 // Player is needed for calculating costs like Singularity functions, that depend on acquired source files
 import { Player } from "../../../src/Player";
 

test/jest/Script/Script.test.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { jest, describe, expect, test } from "@jest/globals";
+
 import { Script } from "../../../src/Script/Script";
 import { Player } from "../../../src/Player";
 

test/jest/StockMarket.test.ts

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { jest, describe, expect, test } from "@jest/globals";
+
 import { CONSTANTS } from "../../src/Constants";
 import { Player } from "../../src/Player";
 import { IMap } from "../../src/types";

test/jest/StringHelperFunctions.test.ts

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { jest, describe, expect, test } from "@jest/globals";
 import { convertTimeMsToTimeElapsedString } from "../../src/utils/StringHelperFunctions";
 
 describe("StringHelperFunctions Tests", function () {

test/jest/Terminal/Directory.test.js

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { jest, describe, expect, test } from "@jest/globals";
 import * as dirHelpers from "../../../src/Terminal/DirectoryHelpers";
 
 describe("Terminal Directory Tests", function () {

test/jest/Terminal/determineAllPossibilitiesForTabCompletion.test.ts

@@ -1,5 +1,7 @@
 import { CityName } from "./../../../src/Locations/data/CityNames";
 /* eslint-disable no-await-in-loop */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { jest, describe, expect, test } from "@jest/globals";
 
 import { Player } from "../../../src/Player";
 import { determineAllPossibilitiesForTabCompletion } from "../../../src/Terminal/determineAllPossibilitiesForTabCompletion";

test/jest/ui/nFormat.test.js

@@ -1,3 +1,4 @@
+import { describe, expect, test } from "@jest/globals";
 import { numeralWrapper } from "../../../src/ui/numeralFormat";
 
 let decimalFormat = "0.[000000]";