Refactor tests

.eslintignore

@@ -2,8 +2,7 @@ node_modules/
 dist/
 coverage/
 **/output/
-./src/test/bugs/output/
-./src/test/features/output/
+src/test/**/output/
 src/func/funcfiftlib.js
 src/grammar/grammar.ohm*.ts
 src/grammar/grammar.ohm*.js

.github/workflows/tact.yml

@@ -74,26 +74,26 @@ jobs:
 
       - name: CLI Test | Check single-contract compilation
         run: |
-          tact --check test/tact-cli/success.tact
-          tact --func test/tact-cli/success.tact
-          tact test/tact-cli/success.tact
+          tact --check bin/test/success.tact
+          tact --func bin/test/success.tact
+          tact bin/test/success.tact
 
       - name: CLI Test | Check compilation via `--config`
         run: |
           # should output complete results
-          tact --config test/tact-cli/success.config.json
+          tact --config bin/test/success.config.json
           # should only run the syntax and type checking
-          tact --config test/tact-cli/success.config.json --check
+          tact --config bin/test/success.config.json --check
 
       - name: CLI Test | Check parsing of a non-existing CLI flag
         if: runner.os != 'Windows'
         run: |
-          ! tact --nonexistentoption test/tact-cli/success.config.json
+          ! tact --nonexistentoption bin/test/success.config.json
 
       - name: CLI Test | tact executable return non-zero exit code if compilation fails
         if: runner.os != 'Windows'
         run: |
-          ! tact --config test/tact-cli/fail.config.json
+          ! tact --config bin/test/fail.config.json
 
       - name: Link Tact compiler
         run: |

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Trailing semicolons in struct and message declarations are optional now: PR [#395](https://github.com/tact-lang/tact/pull/395)
+- Tests are refactored and renamed to convey the sense of what is being tested and to reduce the amount of merge conflicts during development: PR [#402](https://github.com/tact-lang/tact/pull/402)
 
 ### Fixed
 

cspell.json

@@ -4,6 +4,7 @@
   "language": "en",
   "words": [
     "alnum",
+    "assgn",
     "augmentedassign",
     "blockstore",
     "bounceable",
@@ -16,7 +17,9 @@
     "dnsresolve",
     "Fift",
     "forall",
+    "funs",
     "funcfiftlib",
+    "initof",
     "ipfs",
     "ipld",
     "jettons",
@@ -48,11 +51,13 @@
     "stdlib",
     "struct",
     "structs",
+    "subtyping",
     "testdata",
     "Topup",
     "typechecker",
     "uintptr",
     "uncons",
+    "uninit",
     "unixfs",
     "workchain",
     "привет",
@@ -72,18 +77,19 @@
     "src/generator/writers/__snapshots__/writeSerialization.spec.ts.snap",
     "src/grammar/grammar.ohm-bundle.d.ts",
     "src/imports/stdlib.ts",
-    "src/test/__snapshots__/bugs.spec.ts.snap",
-    "src/test/__snapshots__/feature-constants.spec.ts.snap",
-    "src/test/__snapshots__/feature-deep.spec.ts.snap",
-    "src/test/__snapshots__/feature-implicit-init.spec.ts.snap",
-    "src/test/__snapshots__/feature-masterchain.spec.ts.snap",
-    "src/test/__snapshots__/feature-try-catch.spec.ts.snap",
-    "src/test/feature-address.spec.ts",
-    "src/test/feature-intrinsics.spec.ts",
-    "src/test/feature-optionals.spec.ts",
-    "src/test/feature-strings.spec.ts",
-    "src/test/features/intrinsics.tact",
-    "src/test/features/strings.tact",
+    "/src/test/compilation-failed/const-eval-failed.spec.ts",
+    "src/test/e2e-emulated/__snapshots__/constants.spec.ts.snap",
+    "src/test/e2e-emulated/__snapshots__/deep.spec.ts.snap",
+    "src/test/e2e-emulated/__snapshots__/implicit-init.spec.ts.snap",
+    "src/test/e2e-emulated/__snapshots__/masterchain.spec.ts.snap",
+    "src/test/e2e-emulated/__snapshots__/sample-jetton.spec.ts.snap",
+    "src/test/e2e-emulated/__snapshots__/try-catch.spec.ts.snap",
+    "src/test/e2e-emulated/address.spec.ts",
+    "src/test/e2e-emulated/intrinsics.spec.ts",
+    "src/test/e2e-emulated/optionals.spec.ts",
+    "src/test/e2e-emulated/strings.spec.ts",
+    "src/test/e2e-emulated/contracts/intrinsics.tact",
+    "src/test/e2e-emulated/contracts/strings.tact",
     "src/test/compilation-fail/fail-const-eval.spec.ts",
     "stdlib/stdlib.fc"
   ]

jest.teardown.js

@@ -9,11 +9,18 @@ module.exports = async () => {
                 __dirname,
                 "src",
                 "test",
-                "features",
+                "codegen",
+                "output",
+                "*.boc",
+            ),
+            path.resolve(
+                __dirname,
+                "src",
+                "test",
+                "e2e-emulated",
                 "output",
                 "*.boc",
             ),
-            path.resolve(__dirname, "src", "test", "bugs", "output", "*.boc"),
             path.resolve(
                 __dirname,
                 "src",

package.json

@@ -26,7 +26,8 @@
     "dist/**/*",
     "src/**/*",
     "bin/**/*",
-    "stdlib/**/*"
+    "stdlib/**/*",
+    "!**/test"
   ],
   "main": "./dist/main.js",
   "bin": {

scripts/prepare.ts

@@ -1,11 +1,8 @@
 import fs from "fs";
 import { decompileAll } from "@tact-lang/opcode";
 import { run } from "../src/node";
-import { build } from "../src/pipeline/build";
 import { FuncCompilationResult, funcCompile } from "../src/func/funcCompile";
 import path from "path";
-import { ConfigProject } from "../src/config/parseConfig";
-import { createNodeFileSystem } from "../src/vfs/createNodeFileSystem";
 import { glob } from "glob";
 import { verify } from "../src/verify";
 import { consoleLogger } from "../src/logger";
@@ -35,31 +32,6 @@ import { __DANGER__disableVersionNumber } from "../src/pipeline/version";
         }
     }
 
-    // Compile test contracts
-    for (const p of [
-        { path: path.resolve(__dirname, "..", "src", "test", "contracts") },
-    ]) {
-        const recs = fs.readdirSync(p.path);
-        for (const r of recs) {
-            if (!r.endsWith(".tact")) {
-                continue;
-            }
-
-            const config: ConfigProject = {
-                name: r.slice(0, r.length - ".tact".length),
-                path: "./" + r,
-                output: "./output/",
-            };
-            const stdlib = "@stdlib";
-            const project = createNodeFileSystem(p.path, false);
-            await build({
-                config,
-                stdlib,
-                project,
-            });
-        }
-    }
-
     // Compile func files
     for (const p of [{ path: __dirname + "/../func/" }]) {
         const recs = fs.readdirSync(p.path);