@empiricalrun/test-run 0.5.0 → 0.5.3

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @empiricalrun/test-run
 
+## 0.5.3
+
+### Patch Changes
+
+- b9f53be: fix: logs for other signals to catch github actions behavior
+
+## 0.5.2
+
+### Patch Changes
+
+- 7332043: feat: pass signals to test-run child process for graceful exit
+
+## 0.5.1
+
+### Patch Changes
+
+- bce3667: fix: use name and suites to find test block
+- bce3667: fix: test-run package to support suites
+
 ## 0.5.0
 
 ### Minor Changes

package/dist/bin/index.js

@@ -13,6 +13,7 @@ const utils_1 = require("../utils");
         .option("-d, --dir <test-dir>", "Path to the test directory")
         .option("-f, --file <test-file-path>", "Path to the test file")
         .option("-p, --project <project-name...>", "Test projects to run")
+        .option("-s, --suites <suites>", "suites under which the test is defined")
         .option("--skip-teardown", "This options skips running teardown tests")
         .option("--forbid-only", `This options forbids the use of ".only" in the test files`)
         .allowUnknownOption();
@@ -34,10 +35,13 @@ const utils_1 = require("../utils");
         "--dir",
         "-p",
         "--project",
+        "-s",
+        "--suites",
         options.skipTeardown,
         options.name,
         options.dir,
         options.file,
+        options.suites,
         ...options.project, // an array of comma separated project names/pattern matching globs *,premium-*,super-premium-*,safari
     ];
     const pwOptions = process.argv
@@ -69,12 +73,16 @@ const utils_1 = require("../utils");
         if (options.skipTeardown) {
             await (0, utils_1.handleTeardownSkipFlag)(directory);
         }
+        const suites = options.suites && options.suites.trim() !== ""
+            ? options.suites?.split(",")
+            : undefined;
         const { hasTestPassed } = await (0, __1.runTest)({
             name: options.name,
             filePath: options.file,
             dir: directory,
             pwOptions: pwOptions.join(" "),
             platform,
+            suites,
         });
         if (!hasTestPassed) {
             process.exit(1);

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { TestRunParameters } from "./types";
  * @export
  * @param {TestRunParameters} { name, dir, pwOptions }
  */
-export declare function runTest({ name, filePath, dir, pwOptions, platform, }: TestRunParameters): Promise<{
+export declare function runTest({ name, filePath, dir, pwOptions, platform, suites, }: TestRunParameters): Promise<{
     hasTestPassed: boolean;
 }>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,QAAQ,EACR,GAAG,EACH,SAAS,EACT,QAAQ,GACT,EAAE,iBAAiB,GAAG,OAAO,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC,CAMD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE5C;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,EAC5B,IAAI,EACJ,QAAQ,EACR,GAAG,EACH,SAAS,EACT,QAAQ,EACR,MAAM,GACP,EAAE,iBAAiB,GAAG,OAAO,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC,CAaD"}

package/dist/index.js

@@ -8,9 +8,16 @@ const run_specific_test_1 = require("./run-specific-test");
  * @export
  * @param {TestRunParameters} { name, dir, pwOptions }
  */
-async function runTest({ name, filePath, dir, pwOptions, platform, }) {
+async function runTest({ name, filePath, dir, pwOptions, platform, suites, }) {
     if (name) {
-        return await (0, run_specific_test_1.runSpecificTest)({ name, dir, filePath, pwOptions, platform });
+        return await (0, run_specific_test_1.runSpecificTest)({
+            name,
+            dir,
+            filePath,
+            pwOptions,
+            platform,
+            suites,
+        });
     }
     return await (0, run_all_tests_1.runAllTests)({ pwOptions, platform });
 }

package/dist/run-specific-test.d.ts

@@ -4,7 +4,7 @@ import { TestRunParameters } from "./types";
  * @export
  * @param {TestRunParameters} { name, dir, pwOptions }
  */
-export declare function runSpecificTest({ name, filePath, dir, pwOptions, platform, }: TestRunParameters): Promise<{
+export declare function runSpecificTest({ name, filePath, dir, pwOptions, platform, suites, }: TestRunParameters): Promise<{
     hasTestPassed: boolean;
 }>;
 //# sourceMappingURL=run-specific-test.d.ts.map

package/dist/run-specific-test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-specific-test.d.ts","sourceRoot":"","sources":["../src/run-specific-test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAY5C;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,QAAQ,EACR,GAAG,EACH,SAAS,EACT,QAAQ,GACT,EAAE,iBAAiB,GAAG,OAAO,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC,CA0ED"}
+{"version":3,"file":"run-specific-test.d.ts","sourceRoot":"","sources":["../src/run-specific-test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAY5C;;;;GAIG;AACH,wBAAsB,eAAe,CAAC,EACpC,IAAI,EACJ,QAAQ,EACR,GAAG,EACH,SAAS,EACT,QAAQ,EACR,MAAM,GACP,EAAE,iBAAiB,GAAG,OAAO,CAAC;IAC7B,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC,CA2ED"}

package/dist/run-specific-test.js

@@ -11,7 +11,7 @@ const utils_1 = require("./utils");
  * @export
  * @param {TestRunParameters} { name, dir, pwOptions }
  */
-async function runSpecificTest({ name, filePath, dir, pwOptions, platform, }) {
+async function runSpecificTest({ name, filePath, dir, pwOptions, platform, suites, }) {
     const files = await (0, utils_1.getAllFilePaths)(dir, {
         filePath,
     });
@@ -19,7 +19,11 @@ async function runSpecificTest({ name, filePath, dir, pwOptions, platform, }) {
     // find the first file that contains the test block
     // TODO: add suites support
     for (const file of files) {
-        const match = await (0, utils_1.hasTestBlock)({ filePath: file, scenarioName: name });
+        const match = await (0, utils_1.hasTestBlock)({
+            filePath: file,
+            scenarioName: name,
+            suites,
+        });
         if (match) {
             matchingFilePath = file;
             break;
@@ -32,6 +36,7 @@ async function runSpecificTest({ name, filePath, dir, pwOptions, platform, }) {
     const { testCaseNode, sourceFile } = await (0, utils_1.getTestCaseNode)({
         filePath: matchingFilePath,
         scenarioName: name,
+        suites,
     });
     const parentDescribe = (0, utils_1.findFirstSerialDescribeBlock)(testCaseNode);
     const isFileMarkedSerial = await (0, utils_1.hasTopLevelDescribeConfigureWithSerialMode)(matchingFilePath);
@@ -39,23 +44,20 @@ async function runSpecificTest({ name, filePath, dir, pwOptions, platform, }) {
     console.log("Is parent describe block marked serial:", !!parentDescribe);
     console.log("Is file marked serial:", isFileMarkedSerial);
     const currentFileContent = await fs_extra_1.default.readFile(matchingFilePath, "utf-8");
-    const revertFileContent = () => {
-        fs_extra_1.default.writeFileSync(matchingFilePath, currentFileContent);
-    };
     // revert the changes made to the file to mark tests as only
     // these needs to handle by listening to process exit/kill events
-    process.on("beforeExit", () => {
-        revertFileContent();
-    });
-    process.on("exit", () => {
-        revertFileContent();
-    });
-    process.on("SIGINT", () => {
-        revertFileContent();
-    });
-    process.on("SIGTERM", () => {
-        revertFileContent();
-    });
+    const revertFileContent = () => {
+        try {
+            fs_extra_1.default.writeFileSync(matchingFilePath, currentFileContent);
+        }
+        catch (error) {
+            console.error("Error while cleaning up test file:", error);
+        }
+    };
+    process.on("beforeExit", revertFileContent);
+    process.on("exit", revertFileContent);
+    process.on("SIGINT", revertFileContent);
+    process.on("SIGTERM", revertFileContent);
     // if the file is not marked serial, we need to mark the test or describe block as only
     if (!isFileMarkedSerial && testCaseNode) {
         await (0, utils_1.markTestAsOnly)({

package/dist/types/index.d.ts

@@ -4,6 +4,7 @@ export type TestRunParameters = {
     dir?: string;
     pwOptions?: string;
     platform: Platform;
+    suites?: string[];
 };
 export type Environment = {
     id: number;

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAEF,oBAAY,QAAQ;IAClB,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,GAAG,QAAQ;CACZ;AAED,oBAAY,aAAa;IACvB,UAAU,eAAe;IACzB,SAAS,cAAc;CACxB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACjC,CAAC;AAEF,oBAAY,QAAQ;IAClB,GAAG,QAAQ;IACX,OAAO,YAAY;IACnB,GAAG,QAAQ;CACZ;AAED,oBAAY,aAAa;IACvB,UAAU,eAAe;IACzB,SAAS,cAAc;CACxB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B,CAAC"}

package/dist/utils/index.d.ts

@@ -13,16 +13,18 @@ export declare function getAllFilePaths(directoryPath?: string, filters?: {
     filePath?: string;
 }): Promise<string[]>;
 export declare const getTestModuleAliasFromSourceFile: (sourceFile: SourceFile) => string;
-export declare function getTestCaseNode({ filePath, scenarioName, }: {
+export declare function getTestCaseNode({ filePath, scenarioName, suites, }: {
     filePath: string;
     scenarioName: string;
+    suites?: string[];
 }): Promise<{
     testCaseNode: Node | undefined;
     sourceFile: SourceFile;
 }>;
-export declare function hasTestBlock({ filePath, scenarioName, }: {
+export declare function hasTestBlock({ filePath, scenarioName, suites, }: {
     filePath: string;
     scenarioName: string;
+    suites?: string[];
 }): Promise<boolean>;
 export declare function findFirstSerialDescribeBlock(node: Node | undefined): Node | undefined;
 export declare function hasTopLevelDescribeConfigureWithSerialMode(filePath: string): Promise<boolean>;
@@ -43,4 +45,21 @@ export declare const pickNameFromPackageJson: () => Promise<string | undefined>;
 export declare const downloadBuild: (buildUrl: string) => Promise<void>;
 export declare const getTestRunner: (platform: Platform) => TestFramework;
 export declare const handleTeardownSkipFlag: (directory: string) => Promise<void>;
+/**
+ * function to get the test block and test node for the scenario
+ * @export
+ * @param {string} scenarioName
+ * @param {string} content
+ * @return { testBlock: string; parentDescribe: string; } testBlock - the test block content, testNode - the test function node
+ */
+export declare function getTypescriptTestBlock({ scenarioName, suites, content, }: {
+    scenarioName: string;
+    suites?: string[];
+    content: string;
+}): {
+    testBlock: string | undefined;
+    testNode: Node | undefined;
+    testAlias: string;
+    sourceFile: SourceFile;
+};
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAW,UAAU,EAAc,MAAM,UAAU,CAAC;AAGjE,OAAO,EAEL,QAAQ,EAER,aAAa,EACd,MAAM,UAAU,CAAC;AAElB,wBAAgB,GAAG,CACjB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACxC,OAAO,CAAC,MAAM,CAAC,CA2BjB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,aAAa,GAAE,MAAW,EAC1B,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CA4BnB;AAED,eAAO,MAAM,gCAAgC,eAC/B,UAAU,KACrB,MAgBF,CAAC;AAEF,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,YAAY,GACb,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC;IAAE,YAAY,EAAE,IAAI,GAAG,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC,CAetE;AAED,wBAAsB,YAAY,CAAC,EACjC,QAAQ,EACR,YAAY,GACb,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMnB;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,SAAS,GACrB,IAAI,GAAG,SAAS,CA2BlB;AAED,wBAAsB,0CAA0C,CAC9D,QAAQ,EAAE,MAAM,oBA+BjB;AAED,wBAAsB,cAAc,CAAC,EACnC,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,QAAQ,GACT,EAAE;IACD,UAAU,EAAE,UAAU,CAAC;IACvB,kBAAkB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACtC,YAAY,EAAE,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,iBAgBA;AAED,wBAAsB,+BAA+B,CAAC,QAAQ,EAAE,QAAQ,gBAevE;AAED,eAAO,MAAM,4BAA4B,UAEhC,MAAM,EAAE,mBAGE,MAAM,EAAE,EAAE,KAC1B,MAAM,EAUR,CAAC;AAEF,eAAO,MAAM,sBAAsB;cAIvB,QAAQ;mBACH,MAAM,EAAE;MACrB,QAAQ,MAAM,EAAE,CAmBnB,CAAC;AAEF,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,eAAO,MAAM,uBAAuB,QAAa,QAC/C,MAAM,GAAG,SAAS,CAMnB,CAAC;AAEF,eAAO,MAAM,aAAa,aAAoB,MAAM,KAAG,QAAQ,IAAI,CAWlE,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,KAAG,aAIlD,CAAC;AA4DF,eAAO,MAAM,sBAAsB,cAAqB,MAAM,kBAkB7D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAW,UAAU,EAAc,MAAM,UAAU,CAAC;AAGjE,OAAO,EAEL,QAAQ,EAER,aAAa,EACd,MAAM,UAAU,CAAC;AA6BlB,wBAAgB,GAAG,CACjB,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GACxC,OAAO,CAAC,MAAM,CAAC,CAiCjB;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CACnC,aAAa,GAAE,MAAW,EAC1B,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAO,GAClC,OAAO,CAAC,MAAM,EAAE,CAAC,CA4BnB;AAED,eAAO,MAAM,gCAAgC,eAC/B,UAAU,KACrB,MAgBF,CAAC;AAEF,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,YAAY,EACZ,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,GAAG,OAAO,CAAC;IAAE,YAAY,EAAE,IAAI,GAAG,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAA;CAAE,CAAC,CAQtE;AAED,wBAAsB,YAAY,CAAC,EACjC,QAAQ,EACR,YAAY,EACZ,MAAM,GACP,EAAE;IACD,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB,GAAG,OAAO,CAAC,OAAO,CAAC,CAOnB;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,GAAG,SAAS,GACrB,IAAI,GAAG,SAAS,CA2BlB;AAED,wBAAsB,0CAA0C,CAC9D,QAAQ,EAAE,MAAM,oBA+BjB;AAED,wBAAsB,cAAc,CAAC,EACnC,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,QAAQ,GACT,EAAE;IACD,UAAU,EAAE,UAAU,CAAC;IACvB,kBAAkB,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IACtC,YAAY,EAAE,IAAI,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB,iBAgBA;AAED,wBAAsB,+BAA+B,CAAC,QAAQ,EAAE,QAAQ,gBAevE;AAED,eAAO,MAAM,4BAA4B,UAEhC,MAAM,EAAE,mBAGE,MAAM,EAAE,EAAE,KAC1B,MAAM,EAUR,CAAC;AAEF,eAAO,MAAM,sBAAsB;cAIvB,QAAQ;mBACH,MAAM,EAAE;MACrB,QAAQ,MAAM,EAAE,CAmBnB,CAAC;AAEF,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,eAAO,MAAM,uBAAuB,QAAa,QAC/C,MAAM,GAAG,SAAS,CAMnB,CAAC;AAEF,eAAO,MAAM,aAAa,aAAoB,MAAM,KAAG,QAAQ,IAAI,CAWlE,CAAC;AAEF,eAAO,MAAM,aAAa,aAAc,QAAQ,KAAG,aAIlD,CAAC;AA4DF,eAAO,MAAM,sBAAsB,cAAqB,MAAM,kBAkB7D,CAAC;AAuBF;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,EACrC,YAAY,EACZ,MAAM,EACN,OAAO,GACR,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG;IACF,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,EAAE,IAAI,GAAG,SAAS,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,UAAU,CAAC;CACxB,CA8CA"}

package/dist/utils/index.js

@@ -3,20 +3,47 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleTeardownSkipFlag = exports.getTestRunner = exports.downloadBuild = exports.pickNameFromPackageJson = exports.buildRepoName = exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.getProjectsFromPlaywrightConfig = exports.markTestAsOnly = exports.hasTopLevelDescribeConfigureWithSerialMode = exports.findFirstSerialDescribeBlock = exports.hasTestBlock = exports.getTestCaseNode = exports.getTestModuleAliasFromSourceFile = exports.getAllFilePaths = exports.cmd = void 0;
+exports.getTypescriptTestBlock = exports.handleTeardownSkipFlag = exports.getTestRunner = exports.downloadBuild = exports.pickNameFromPackageJson = exports.buildRepoName = exports.generateProjectFilters = exports.filterArrayByGlobMatchersSet = exports.getProjectsFromPlaywrightConfig = exports.markTestAsOnly = exports.hasTopLevelDescribeConfigureWithSerialMode = exports.findFirstSerialDescribeBlock = exports.hasTestBlock = exports.getTestCaseNode = exports.getTestModuleAliasFromSourceFile = exports.getAllFilePaths = exports.cmd = void 0;
 const child_process_1 = require("child_process");
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
 const minimatch_1 = require("minimatch");
 const path_1 = __importDefault(require("path"));
 const ts_morph_1 = require("ts-morph");
 const api_1 = require("tsx/esm/api");
 const types_1 = require("../types");
+function setupProcessSignalHandlers(proc) {
+    const handleSignal = async (signal) => {
+        console.log(`\nReceived ${signal}, gracefully shutting down...`);
+        if (proc && !proc.killed) {
+            // Forward the signal to the child process
+            proc.kill(signal);
+            // Wait for the child process to exit
+            await new Promise((resolve) => {
+                proc.once("exit", () => {
+                    resolve();
+                });
+            });
+        }
+        process.exit(0);
+    };
+    process.once("SIGINT", async () => await handleSignal("SIGINT"));
+    process.once("SIGTERM", async () => await handleSignal("SIGTERM"));
+    // Handler for other signals to catch GitHub Actions behaviors
+    ["SIGABRT", "SIGHUP", "SIGQUIT"].forEach((signal) => {
+        process.once(signal, () => console.log(`Received ${signal}, which is a no-op`));
+    });
+}
 function cmd(command, options) {
     let errorLogs = [];
     return new Promise((resolveFunc, rejectFunc) => {
-        let p = (0, child_process_1.spawn)(command[0], command.slice(1), {
+        const p = (0, child_process_1.spawn)(command[0], command.slice(1), {
             env: { ...process.env, ...options.env },
+            // Ensure child process receives signals
+            detached: false,
         });
+        // Setup signal handlers
+        setupProcessSignalHandlers(p);
         p.stdout.on("data", (x) => {
             const log = x.toString();
             if (log.includes("Error")) {
@@ -92,21 +119,21 @@ const getTestModuleAliasFromSourceFile = (sourceFile) => {
         ?.getText() || "test");
 };
 exports.getTestModuleAliasFromSourceFile = getTestModuleAliasFromSourceFile;
-async function getTestCaseNode({ filePath, scenarioName, }) {
-    const project = new ts_morph_1.Project();
+async function getTestCaseNode({ filePath, scenarioName, suites, }) {
     const content = await fs_extra_1.default.readFile(filePath, "utf-8");
-    const sourceFile = project.createSourceFile("test.ts", content);
-    const testAlias = (0, exports.getTestModuleAliasFromSourceFile)(sourceFile);
-    const testCaseNode = sourceFile.getFirstDescendant((node) => !!(node.isKind(ts_morph_1.SyntaxKind.CallExpression) &&
-        node.getExpression().getText() === testAlias &&
-        node.getArguments()[0]?.getText().includes(scenarioName)));
-    return { testCaseNode, sourceFile };
+    const { testNode, sourceFile } = getTypescriptTestBlock({
+        scenarioName,
+        content,
+        suites, // since this method is called on the generated content, not the whole file
+    });
+    return { testCaseNode: testNode, sourceFile };
 }
 exports.getTestCaseNode = getTestCaseNode;
-async function hasTestBlock({ filePath, scenarioName, }) {
+async function hasTestBlock({ filePath, scenarioName, suites, }) {
     const { testCaseNode } = await getTestCaseNode({
         filePath,
         scenarioName,
+        suites,
     });
     return !!testCaseNode;
 }
@@ -314,3 +341,72 @@ const handleTeardownSkipFlag = async (directory) => {
     });
 };
 exports.handleTeardownSkipFlag = handleTeardownSkipFlag;
+const getParentDescribeNames = (node) => {
+    const names = [];
+    let current = node.getParent();
+    while (current) {
+        if (ts_morph_1.Node.isCallExpression(current)) {
+            const expr = current.getExpression();
+            if (expr.getText() === "test.describe") {
+                const describeBlockArguments = current.getArguments();
+                if (describeBlockArguments.length > 0) {
+                    const describeBlockName = describeBlockArguments[0];
+                    if (ts_morph_1.Node.isStringLiteral(describeBlockName)) {
+                        names.push(describeBlockName.getLiteralText());
+                    }
+                }
+            }
+        }
+        current = current.getParent();
+    }
+    return names.reverse(); // Reverse to get from outermost to innermost
+};
+/**
+ * function to get the test block and test node for the scenario
+ * @export
+ * @param {string} scenarioName
+ * @param {string} content
+ * @return { testBlock: string; parentDescribe: string; } testBlock - the test block content, testNode - the test function node
+ */
+function getTypescriptTestBlock({ scenarioName, suites, content, }) {
+    const project = new ts_morph_1.Project();
+    const sourceFile = project.createSourceFile("test.ts", content);
+    const testAlias = (0, exports.getTestModuleAliasFromSourceFile)(sourceFile);
+    // Get all test function nodes that match the scenario name
+    const matchingTestFunctionNodes = sourceFile
+        .getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression)
+        .filter((node) => {
+        return Boolean(node.getExpression().getText() === testAlias &&
+            node.getArguments()[0]?.getText().includes(scenarioName));
+    });
+    if (!suites?.length) {
+        const firstNode = matchingTestFunctionNodes?.[0];
+        return {
+            testBlock: firstNode?.getText(),
+            testNode: firstNode,
+            testAlias,
+            sourceFile,
+        };
+    }
+    // Iterate over each test function node and check if the suites match
+    for (const testNode of matchingTestFunctionNodes) {
+        const parentDescribes = getParentDescribeNames(testNode);
+        if ((0, lodash_isequal_1.default)(parentDescribes, suites)) {
+            // Found the matching test block
+            return {
+                testBlock: testNode.getText(),
+                testNode,
+                testAlias,
+                sourceFile,
+            };
+        }
+    }
+    // No matching test block found
+    return {
+        testBlock: undefined,
+        testNode: undefined,
+        testAlias,
+        sourceFile,
+    };
+}
+exports.getTypescriptTestBlock = getTypescriptTestBlock;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-run",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -15,9 +15,11 @@
   },
   "author": "Empirical Team <hey@empirical.run>",
   "dependencies": {
+    "@types/lodash.isequal": "^4.5.8",
     "async-retry": "^1.3.3",
     "commander": "^12.1.0",
     "fs-extra": "^11.2.0",
+    "lodash.isequal": "^4.5.0",
     "minimatch": "^10.0.1",
     "ts-morph": "^23.0.0",
     "tsx": "^4.16.2"