Revert "feat: Add ink! e2e-tests (#127)"

This reverts commit 17f83f0.
inkdevhub · Mar 25, 2024 · e0a2e38 · e0a2e38
1 parent 09b62a7
commit e0a2e38
Show file tree

Hide file tree

Showing 16 changed files with 130 additions and 579 deletions.
diff --git a/src/commands/contract/compile.ts b/src/commands/contract/compile.ts
@@ -1,9 +1,9 @@
 import { Args, Flags } from "@oclif/core";
 import path from "node:path";
+import { ensureCargoContractVersionCompatibility, extractCargoContractVersion, generateTypes, Spinner, storeArtifacts } from "../../lib/index.js";
 import { spawn } from "node:child_process";
 import { pathExists } from "fs-extra/esm";
 import { SwankyCommand } from "../../lib/swankyCommand.js";
-import { ensureCargoContractVersionCompatibility, extractCargoContractVersion, Spinner, storeArtifacts } from "../../lib/index.js";
 import { ConfigError, InputError, ProcessError } from "../../lib/errors.js";
 
 export class CompileContract extends SwankyCommand<typeof CompileContract> {
@@ -126,6 +126,12 @@ export class CompileContract extends SwankyCommand<typeof CompileContract> {
         return storeArtifacts(artifactsPath, contractInfo.name, contractInfo.moduleName);
       }, "Moving artifacts");
 
+      await spinner.runCommand(
+        async () => await generateTypes(contractInfo.name),
+        `Generating ${contractName} contract ts types`,
+        `${contractName} contract's TS types Generated successfully`,
+      );
+
       this.swankyConfig.contracts[contractName].build = {
         timestamp: Date.now(),
         artifactsPath,

diff --git a/src/commands/contract/new.ts b/src/commands/contract/new.ts
@@ -1,12 +1,11 @@
 import { Args, Flags } from "@oclif/core";
 import path from "node:path";
-import { ensureDir, pathExists, pathExistsSync, writeJSON } from "fs-extra/esm";
+import { ensureDir, pathExists, writeJSON } from "fs-extra/esm";
 import {
   checkCliDependencies,
   copyContractTemplateFiles,
   processTemplates,
   getTemplates,
-  prepareTestFiles,
 } from "../../lib/index.js";
 import { email, name, pickTemplate } from "../../lib/prompts.js";
 import { paramCase, pascalCase, snakeCase } from "change-case";
@@ -79,18 +78,6 @@ export class NewContract extends SwankyCommand<typeof NewContract> {
       "Copying contract template files"
     );
 
-    if (contractTemplate === "psp22") {
-      const e2eTestHelpersPath = path.resolve(projectPath, "tests", "test_helpers");
-      if (!pathExistsSync(e2eTestHelpersPath)) {
-        await this.spinner.runCommand(
-          () => prepareTestFiles("e2e", path.resolve(templates.templatesPath), projectPath),
-          "Copying e2e test helpers"
-        );
-      } else {
-        console.log("e2e test helpers already exist. No files were copied.");
-      }
-    }
-
     await this.spinner.runCommand(
       () =>
         processTemplates(projectPath, {
@@ -106,6 +93,7 @@ export class NewContract extends SwankyCommand<typeof NewContract> {
     );
 
     await ensureDir(path.resolve(projectPath, "artifacts", args.contractName));
+    await ensureDir(path.resolve(projectPath, "tests", args.contractName));
 
     await this.spinner.runCommand(async () => {
       this.swankyConfig.contracts[args.contractName] = {

diff --git a/src/commands/contract/test.ts b/src/commands/contract/test.ts
@@ -3,13 +3,11 @@ import { Flags, Args } from "@oclif/core";
 import path from "node:path";
 import { globby } from "globby";
 import Mocha from "mocha";
-import { emptyDir, pathExistsSync } from "fs-extra/esm";
+import { emptyDir } from "fs-extra/esm";
 import shell from "shelljs";
 import { Contract } from "../../lib/contract.js";
 import { SwankyCommand } from "../../lib/swankyCommand.js";
-import { ConfigError, FileError, InputError, ProcessError, TestError } from "../../lib/errors.js";
-import { spawn } from "node:child_process";
-import { Spinner } from "../../lib/index.js";
+import { ConfigError, FileError, InputError, TestError } from "../../lib/errors.js";
 
 declare global {
   var contractTypesPath: string; // eslint-disable-line no-var
@@ -22,11 +20,7 @@ export class TestContract extends SwankyCommand<typeof TestContract> {
     all: Flags.boolean({
       default: false,
       char: "a",
-      description: "Run tests for all contracts",
-    }),
-    mocha: Flags.boolean({
-        default: false,
-        description: "Run tests with mocha",
+      description: "Set all to true to compile all contracts",
     }),
   };
 
@@ -49,7 +43,7 @@ export class TestContract extends SwankyCommand<typeof TestContract> {
       ? Object.keys(this.swankyConfig.contracts)
       : [args.contractName];
 
-    const spinner = new Spinner();
+    const testDir = path.resolve("tests");
 
     for (const contractName of contractNames) {
       const contractRecord = this.swankyConfig.contracts[contractName];
@@ -67,119 +61,54 @@ export class TestContract extends SwankyCommand<typeof TestContract> {
         );
       }
 
-      console.log(`Testing contract: ${contractName}`);
+      const artifactsCheck = await contract.artifactsExist();
 
-      if (!flags.mocha) {
-        await spinner.runCommand(
-          async () => {
-            return new Promise<string>((resolve, reject) => {
-              const compileArgs = [
-                "test",
-                "--features",
-                "e2e-tests",
-                "--manifest-path",
-                `contracts/${contractName}/Cargo.toml`,
-                "--release"
-              ];
-
-              const compile = spawn("cargo", compileArgs);
-              this.logger.info(`Running e2e-tests command: [${JSON.stringify(compile.spawnargs)}]`);
-              let outputBuffer = "";
-              let errorBuffer = "";
-
-              compile.stdout.on("data", (data) => {
-                outputBuffer += data.toString();
-                spinner.ora.clear();
-              });
-              compile.stdout.pipe(process.stdout);
-
-              compile.stderr.on("data", (data) => {
-                errorBuffer += data;
-              });
-
-              compile.on("exit", (code) => {
-                if (code === 0) {
-                  const regex = /test result: (.*)/;
-                  const match = outputBuffer.match(regex);
-                  if (match) {
-                    this.logger.info(`Contract ${contractName} e2e-testing done.`);
-                    resolve(match[1]);
-                  }
-                } else {
-                  reject(new ProcessError(errorBuffer));
-                }
-              });
-            });
-          },
-          `Testing ${contractName} contract`,
-          `${contractName} testing finished successfully`
+      if (!artifactsCheck.result) {
+        throw new FileError(
+          `No artifact file found at path: ${artifactsCheck.missingPaths.toString()}`
         );
-      } else {
-
-        const testDir = path.resolve("tests");
-
-        if (!pathExistsSync(testDir)) {
-          throw new FileError(`Tests folder does not exist: ${testDir}`);
-        }
-
-        const artifactsCheck = await contract.artifactsExist();
-
-        if (!artifactsCheck.result) {
-          throw new FileError(
-            `No artifact file found at path: ${artifactsCheck.missingPaths.toString()}`
-          );
-        }
-
-        const artifactPath = path.resolve("typedContracts", `${contractName}`);
-        const typedContractCheck = await contract.typedContractExists(contractName);
-
-        this.log(`artifactPath: ${artifactPath}`);
-
-        if (!typedContractCheck.result) {
-          throw new FileError(
-            `No typed contract found at path: ${typedContractCheck.missingPaths.toString()}`
-          );
-        }
-
-        const reportDir = path.resolve(testDir, contract.name, "testReports");
-
-        await emptyDir(reportDir);
-
-        const mocha = new Mocha({
-          timeout: 200000,
-          reporter: "mochawesome",
-          reporterOptions: {
-            reportDir,
-            charts: true,
-            reportTitle: `${contractName} test report`,
-            quiet: true,
-            json: false,
-          },
-        });
-
-        const tests = await globby(`${path.resolve(testDir, contractName)}/*.test.ts`);
+      }
 
-        tests.forEach((test) => {
-          mocha.addFile(test);
-        });
+      console.log(`Testing contract: ${contractName}`);
 
-        global.contractTypesPath = path.resolve(testDir, contractName, "typedContract");
-
-        shell.cd(`${testDir}/${contractName}`);
-        try {
-          await new Promise<void>((resolve, reject) => {
-            mocha.run((failures) => {
-              if (failures) {
-                reject(`At least one of the tests failed. Check report for details: ${reportDir}`);
-              } else {
-                this.log(`All tests passing. Check the report for details: ${reportDir}`);
-                resolve();
-              }
-            });
+      const reportDir = path.resolve(testDir, contract.name, "testReports");
+
+      await emptyDir(reportDir);
+
+      const mocha = new Mocha({
+        timeout: 200000,
+        reporter: "mochawesome",
+        reporterOptions: {
+          reportDir,
+          charts: true,
+          reportTitle: `${contractName} test report`,
+          quiet: true,
+          json: false,
+        },
+      });
+
+      const tests = await globby(`${path.resolve(testDir, contractName)}/*.test.ts`);
+
+      tests.forEach((test) => {
+        mocha.addFile(test);
+      });
+
+      global.contractTypesPath = path.resolve(testDir, contractName, "typedContract");
+
+      shell.cd(`${testDir}/${contractName}`);
+      try {
+        await new Promise<void>((resolve, reject) => {
+          mocha.run((failures) => {
+            if (failures) {
+              reject(`At least one of the tests failed. Check report for details: ${reportDir}`);
+            } else {
+              this.log(`All tests passing. Check the report for details: ${reportDir}`);
+              resolve();
+            }
           });
-        } catch (cause) {
-          throw new TestError("Error in test", { cause });
-        }
+        });
+      } catch (cause) {
+        throw new TestError("Error in test", { cause });
       }
     }
   }

diff --git a/src/commands/generate/types.ts → src/commands/contract/typegen.ts b/src/commands/generate/types.ts → src/commands/contract/typegen.ts
@@ -4,7 +4,7 @@ import { Contract } from "../../lib/contract.js";
 import { SwankyCommand } from "../../lib/swankyCommand.js";
 import { ConfigError, FileError } from "../../lib/errors.js";
 
-export class GenerateTypes extends SwankyCommand<typeof GenerateTypes> {
+export class TypegenCommand extends SwankyCommand<typeof TypegenCommand> {
   static description = "Generate types from compiled contract metadata";
 
   static args = {
@@ -16,7 +16,7 @@ export class GenerateTypes extends SwankyCommand<typeof GenerateTypes> {
   };
 
   async run(): Promise<void> {
-    const { args } = await this.parse(GenerateTypes);
+    const { args } = await this.parse(TypegenCommand);
 
     const contractRecord = this.swankyConfig.contracts[args.contractName];
     if (!contractRecord) {