fix: refactoring broken tests (#688)

Author: arboleya

.changeset/young-panthers-argue.md

@@ -0,0 +1,7 @@
+---
+"@fuel-ts/abi-typegen": patch
+"fuels": patch
+"@fuel-ts/versions": patch
+---
+
+Refactoring and fixing broken tests

packages/abi-typegen/package.json

@@ -33,6 +33,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
+    "@fuel-ts/versions": "workspace:*",
     "commander": "^9.4.1",
     "glob": "^8.0.3",
     "handlebars": "^4.7.7",
@@ -41,7 +42,6 @@
     "rimraf": "^3.0.2"
   },
   "devDependencies": {
-    "@fuel-ts/versions": "workspace:*",
     "@types/glob": "^8.0.0",
     "@types/lodash.upperfirst": "^4.3.7",
     "@types/mkdirp": "^1.0.2",
@@ -52,8 +52,6 @@
     "transpile:hbs": "ts-node ./scripts/transpile.hbs.ts",
     "prebuild": "pnpm transpile:hbs",
     "build": "tsup --dts",
-    "build:fixtures": "ts-node ./test/fixtures/buildAll.ts",
-    "test": "jest test --coverage",
-    "test:watch": "jest test --watch --coverage"
+    "build:fixtures": "ts-node ./test/fixtures/buildAll.ts"
   }
 }

packages/abi-typegen/src/bin.test.ts

@@ -14,10 +14,6 @@
     ".": {
       "require": "./dist/index.js",
       "default": "./dist/index.mjs"
-    },
-    "./dist/cli": {
-      "require": "./dist/dist.js",
-      "default": "./dist/dist.mjs"
     }
   },
   "publishConfig": {
@@ -59,8 +55,6 @@
   },
   "scripts": {
     "build": "tsup --dts",
-    "build:watch": "tsup --dts --watch",
-    "test": "jest test --coverage",
-    "test:watch": "jest test --watch --coverage"
+    "build:watch": "tsup --dts --watch"
   }
 }

packages/fuels/package.json

@@ -1,41 +1,37 @@
-// TODO: Review and fix tests
+import { versions } from '@fuel-ts/versions';
+import { Command } from 'commander';
 
-// import { Command } from 'commander';
-
-// import { run } from './cli';
-
-// jest.mock('@fuel-ts/versions', () => ({
-//   versions: { FUELS: '9.8.7' },
-// }));
+import { run } from './cli';
 
 describe('cli.js', () => {
   test('should call `versions` sub-program', async () => {
-    expect(true).toBeTruthy();
     // mocking
-    // const name = jest.spyOn(Command.prototype, 'name');
-    // const version = jest.spyOn(Command.prototype, 'version');
-    // const command = jest.spyOn(Command.prototype, 'command');
-    // const description = jest.spyOn(Command.prototype, 'description');
-    // const action = jest.spyOn(Command.prototype, 'action');
-    // const parse = jest.spyOn(Command.prototype, 'parse').mockImplementation();
-
-    // // executing
-    // run([]); // simulates argv array
-
-    // // validating
-    // expect(name).toHaveBeenCalledWith('fuels');
-    // expect(version).toHaveBeenCalledWith('9.8.7');
-
-    // expect(command).toHaveBeenNthCalledWith(1, 'versions');
-    // expect(description).toHaveBeenNthCalledWith(1, 'check for version incompatibilities');
-
-    // expect(command).toHaveBeenNthCalledWith(2, 'typegen');
-    // expect(description).toHaveBeenNthCalledWith(
-    //   2,
-    //   'generate typescript from contract abi json files'
-    // );
-
-    // expect(action).toHaveBeenCalledTimes(2);
-    // expect(parse).toHaveBeenCalledTimes(1);
+    const name = jest.spyOn(Command.prototype, 'name');
+    const version = jest.spyOn(Command.prototype, 'version');
+    const command = jest.spyOn(Command.prototype, 'command');
+    const description = jest.spyOn(Command.prototype, 'description');
+    const action = jest.spyOn(Command.prototype, 'action');
+    const parse = jest.spyOn(Command.prototype, 'parse').mockImplementation();
+
+    // executing
+    const argv = ['a', 'b', 'c'];
+    run(argv);
+
+    // validating
+    expect(name).toHaveBeenCalledWith('fuels');
+    expect(version).toHaveBeenCalledWith(versions.FUELS);
+
+    expect(command).toHaveBeenNthCalledWith(1, 'versions');
+    expect(description).toHaveBeenNthCalledWith(1, 'check for version incompatibilities');
+
+    expect(command).toHaveBeenNthCalledWith(2, 'typegen');
+    expect(description).toHaveBeenNthCalledWith(
+      2,
+      'generate typescript from contract abi json files'
+    );
+
+    expect(action).toHaveBeenCalledTimes(2);
+    expect(parse).toHaveBeenCalledTimes(1);
+    expect(parse).toHaveBeenCalledWith(argv);
   });
 });

packages/fuels/src/bin.test.ts

@@ -1,11 +1,11 @@
-import { configureCliOptions as routeTypeGen } from '@fuel-ts/abi-typegen/cli';
+import { configureCliOptions as configureTypegenCliOptions } from '@fuel-ts/abi-typegen/cli';
 import { versions } from '@fuel-ts/versions';
 import { run as runVersions } from '@fuel-ts/versions/cli';
 import { Command } from 'commander';
-import { argv } from 'process';
 
-export function run(_argv: string[]) {
+export function run(argv: string[]) {
   const program = new Command();
+
   program.name('fuels');
   program.version(versions.FUELS);
 
@@ -20,7 +20,7 @@ export function run(_argv: string[]) {
     .command('typegen')
     .description(`generate typescript from contract abi json files`);
 
-  routeTypeGen(typegen);
+  configureTypegenCliOptions(typegen);
 
   // vroom vroom
   program.parse(argv);

packages/fuels/src/cli.test.ts

@@ -29,18 +29,15 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@types/cli-table": "^0.3.1",
-    "@types/yargs": "^17.0.13",
     "chalk": "4",
     "cli-table": "^0.3.11",
     "semver": "^7.3.8"
   },
   "devDependencies": {
+    "@types/cli-table": "^0.3.1",
     "@types/semver": "^7.3.13"
   },
   "scripts": {
-    "build": "tsup --dts --env.BUILD_VERSION $BUILD_VERSION --env.FORC_VERSION $FORC_VERSION --env.FUEL_CORE_VERSION $FUEL_CORE_VERSION",
-    "test": "jest test --coverage",
-    "test:watch": "jest test --watch --coverage"
+    "build": "tsup --dts --env.BUILD_VERSION $BUILD_VERSION --env.FORC_VERSION $FORC_VERSION --env.FUEL_CORE_VERSION $FUEL_CORE_VERSION"
   }
 }