chore: stop removing fuel-ts/utils node modules on unit test (#1692)

FuelLabs · Feb 1, 2024 · d261154 · d261154
1 parent af66671
commit d261154
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 103 deletions.
diff --git a/.changeset/honest-parrots-wait.md b/.changeset/honest-parrots-wait.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/packages/abi-coder/src/coders/boolean.test.ts b/packages/abi-coder/src/coders/boolean.test.ts
@@ -3,14 +3,6 @@ import { expectToThrowFuelError } from '@fuel-ts/errors/test-utils';
 
 import { BooleanCoder } from './boolean';
 
-vi.mock('@fuel-ts/math', async () => {
-  const mod = await vi.importActual('@fuel-ts/math');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 /**
  * @group node
  */

diff --git a/packages/abi-typegen/test/utils/mockVersions.ts b/packages/abi-typegen/test/utils/mockVersions.ts
@@ -1,22 +1,5 @@
 import * as versionsMod from '@fuel-ts/versions';
 
-// TODO: Check if there's a better alternative to this
-/**
- * This makes it possible to mock modules that are exported
- * from package's index files, using exports syntax such as:
- *
- *  export * from '...'
- *
- * https://stackoverflow.com/a/72885576
- */
-vi.mock('@fuel-ts/versions', async () => {
-  const mod = await vi.importActual('@fuel-ts/versions');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 export function mockVersions(
   values: {
     FUELS: string;

diff --git a/packages/fuels/src/cli/commands/dev/autoStartFuelCore.test.ts b/packages/fuels/src/cli/commands/dev/autoStartFuelCore.test.ts
@@ -8,14 +8,6 @@ import type { FuelsConfig } from '../../types';
 import type { FuelCoreNode } from './autoStartFuelCore';
 import { autoStartFuelCore } from './autoStartFuelCore';
 
-vi.mock('@fuel-ts/wallet/test-utils', async () => {
-  const mod = await vi.importActual('@fuel-ts/wallet/test-utils');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 /**
  * @group node
  */

diff --git a/packages/fuels/src/cli/commands/init/shouldUseBuiltinForc.test.ts b/packages/fuels/src/cli/commands/init/shouldUseBuiltinForc.test.ts
@@ -4,14 +4,6 @@ import { mockLogger } from '../../../../test/utils/mockLogger';
 
 import { shouldUseBuiltinFuelCore } from './shouldUseBuiltinFuelCore';
 
-vi.mock('@fuel-ts/versions/cli', async () => {
-  const mod = await vi.importActual('@fuel-ts/versions/cli');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 vi.mock('prompts', async () => {
   const mod = await vi.importActual('prompts');
   return {

diff --git a/packages/fuels/src/cli/commands/init/shouldUseBuiltinFuelCore.test.ts b/packages/fuels/src/cli/commands/init/shouldUseBuiltinFuelCore.test.ts
@@ -4,14 +4,6 @@ import { mockLogger } from '../../../../test/utils/mockLogger';
 
 import { shouldUseBuiltinForc } from './shouldUseBuiltinForc';
 
-vi.mock('@fuel-ts/versions/cli', async () => {
-  const mod = await vi.importActual('@fuel-ts/versions/cli');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 /**
  * @group node
  */

diff --git a/packages/providers/package.json b/packages/providers/package.json
@@ -36,16 +36,15 @@
     "@fuel-ts/math": "workspace:*",
     "@fuel-ts/hasher": "workspace:*",
     "@fuel-ts/transactions": "workspace:*",
-    "ethers": "^6.7.1",
     "@fuel-ts/versions": "workspace:*",
+    "ethers": "^6.7.1",
     "graphql": "^16.6.0",
     "graphql-request": "5.0.0",
     "graphql-tag": "^2.12.6",
     "ramda": "^0.29.0",
     "tai64": "^1.0.0"
   },
   "devDependencies": {
-    "@fuel-ts/utils": "workspace:*",
     "@graphql-codegen/cli": "^2.13.7",
     "@graphql-codegen/typescript": "^2.8.0",
     "@graphql-codegen/typescript-operations": "^2.5.5",

diff --git a/packages/providers/test/provider.test.ts b/packages/providers/test/provider.test.ts
@@ -25,22 +25,6 @@ import * as gasMod from '../src/utils/gas';
 
 import { messageProofResponse, messageStatusResponse } from './fixtures';
 
-vi.mock('@fuel-ts/versions', async () => {
-  const mod = await vi.importActual('@fuel-ts/versions');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
-vi.mock('@fuel-ts/math', async () => {
-  const mod = await vi.importActual('@fuel-ts/math');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 afterEach(() => {
   vi.restoreAllMocks();
 });

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -48,10 +48,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@fuel-ts/interfaces": "workspace:*",
+    "@fuel-ts/errors": "workspace:*",
     "ramda": "^0.29.0",
     "rimraf": "^3.0.2"
-  },
-  "devDependencies": {
-    "@fuel-ts/errors": "workspace:*"
   }
 }
diff --git a/packages/utils/src/cli-utils/findBinPath.test.ts b/packages/utils/src/cli-utils/findBinPath.test.ts
@@ -14,7 +14,13 @@ describe('findBinPath', () => {
     const bin = join(mods, '.bin');
     const cmdPath = join(bin, cmdName);
 
-    const resetDisk = () => rmSync(mods, { recursive: true });
+    const resetDisk = (params?: { cmdOnly: boolean }) => {
+      if (params?.cmdOnly) {
+        rmSync(cmdPath);
+      } else {
+        rmSync(mods, { recursive: true });
+      }
+    };
 
     mkdirSync(bin, { recursive: true });
     writeFileSync(cmdPath, '');
@@ -45,7 +51,7 @@ describe('findBinPath', () => {
     const { cmdName, cmdPath, resetDisk } = bootstrap(base);
     const binPath = findBinPath(cmdName, base);
 
-    resetDisk();
+    resetDisk({ cmdOnly: true });
     expect(binPath).toEqual(cmdPath);
   });
 

diff --git a/packages/wallet/src/account.test.ts b/packages/wallet/src/account.test.ts
@@ -16,14 +16,6 @@ import type { TxParamsType } from './account';
 import { Account } from './account';
 import { FUEL_NETWORK_URL } from './configs';
 
-vi.mock('@fuel-ts/providers', async () => {
-  const mod = await vi.importActual('@fuel-ts/providers');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 let provider: Provider;
 
 afterEach(() => {

diff --git a/packages/wallet/src/utils.test.ts b/packages/wallet/src/utils.test.ts
@@ -9,14 +9,6 @@ import {
   formatScriptDataForTransferringToContract,
 } from './utils';
 
-vi.mock('@fuels/vm-asm', async () => {
-  const mod = await vi.importActual('@fuels/vm-asm');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 vi.mock('ethers', async () => {
   const mod = await vi.importActual('ethers');
   return {

diff --git a/packages/wallet/src/wallet-unlocked.test.ts b/packages/wallet/src/wallet-unlocked.test.ts
@@ -14,14 +14,6 @@ import * as keystoreWMod from './keystore-wallet';
 import walletSpec from './wallet-spec';
 import { WalletLocked, WalletUnlocked } from './wallets';
 
-vi.mock('@fuel-ts/providers', async () => {
-  const mod = await vi.importActual('@fuel-ts/providers');
-  return {
-    __esModule: true,
-    ...mod,
-  };
-});
-
 const { ScriptTransactionRequest } = providersMod;
 
 /**

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml