testit-adapter-playwright 3.6.1 → 3.7.0-TMS-5.6

package/dist/converter.js

@@ -43,9 +43,16 @@ class Converter {
         return autotestResult;
     }
     static convertTestStepsToShortSteps(steps) {
-        return steps
-            .filter((step) => (0, utils_1.isStep)(step))
-            .map(step => this.convertTestStepToShortStep(step));
+        const out = [];
+        for (const step of steps) {
+            if ((0, utils_1.isStep)(step)) {
+                out.push(this.convertTestStepToShortStep(step));
+            }
+            else if (step.steps?.length) {
+                out.push(...this.convertTestStepsToShortSteps(step.steps));
+            }
+        }
+        return out;
     }
     static convertTestStepToShortStep(step) {
         return {
@@ -54,9 +61,16 @@ class Converter {
         };
     }
     static convertTestStepsToSteps(steps, attachmentsMap) {
-        return steps
-            .filter((step) => (0, utils_1.isStep)(step))
-            .map(step => this.convertTestStepToStep(step, attachmentsMap));
+        const out = [];
+        for (const step of steps) {
+            if ((0, utils_1.isStep)(step)) {
+                out.push(this.convertTestStepToStep(step, attachmentsMap));
+            }
+            else if (step.steps?.length) {
+                out.push(...this.convertTestStepsToSteps(step.steps, attachmentsMap));
+            }
+        }
+        return out;
     }
     static convertTestStepToStep(step, attachmentsMap) {
         const steps = step.steps.length !== 0 ? this.convertTestStepsToSteps(step.steps, attachmentsMap) : [];

package/dist/labels.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.testit = exports.Extensions = exports.ContentType = void 0;
 const crypto_1 = require("crypto");
 const test_1 = __importDefault(require("@playwright/test"));
+const utils_1 = require("./utils");
 var ContentType;
 (function (ContentType) {
     ContentType["TEXT"] = "text/plain";
@@ -40,8 +41,8 @@ class testit {
         });
     }
     static async addAttachment(name, content, options) {
-        const stepName = `stepattach_${(0, crypto_1.randomUUID)()}_${name}`;
         const contentType = typeof options === "string" ? options : options.contentType;
+        const stepName = (0, utils_1.processAttachmentNameExtensions)(`stepattach_${(0, crypto_1.randomUUID)()}_${name}`, contentType);
         await this.step(stepName, async () => {
             await test_1.default.info().attach(stepName, {
                 body: content,

package/dist/models/result.d.ts

@@ -1,11 +1,13 @@
 import { TestStatus } from "@playwright/test";
-import { TestError } from "@playwright/test/reporter";
+import { TestError, TestStep } from "@playwright/test/reporter";
 export interface Result {
     status: TestStatus;
     attachments: Array<ResultAttachment>;
     duration: number;
     error?: TestError;
     errors: Array<TestError>;
+    /** Full Playwright step tree (fixtures, hooks, test.step); preferred over reporter cache. */
+    steps?: TestStep[];
 }
 export interface ResultAttachment {
     /**

package/dist/reporter.js

@@ -47,6 +47,7 @@ class TmsReporter {
             duration: result.duration,
             errors: result.errors,
             error: result.error,
+            steps: result.steps,
         }));
     }
     // fix issues with trace and video files on playwright
@@ -86,6 +87,7 @@ class TmsReporter {
                 attachments: [],
                 duration: 0,
                 errors: [],
+                steps: [],
             });
         });
     }
@@ -106,17 +108,6 @@ class TmsReporter {
             addAttachments: [],
             externalKey: test.title,
         };
-        const dictionaries = this.getDictionariesByTest(test);
-        const namespace = dictionaries
-            .slice(0, -1)
-            .join(path_1.default.sep);
-        const classname = dictionaries[dictionaries.length - 1];
-        if (namespace != undefined && namespace.length > 0) {
-            autotestData.namespace = namespace;
-        }
-        if (classname != undefined && classname.length > 0) {
-            autotestData.classname = classname;
-        }
         for (const attachment of result.attachments) {
             if (!attachment.body) {
                 if (attachment.path && attachment.name !== "screenshot") {
@@ -184,13 +175,27 @@ class TmsReporter {
     }
     async loadTest(test, result) {
         const autotestData = await this.getAutotestData(test, result);
+        const origin = await this.strategy.client.autoTests.getAutotestByExternalId(autotestData.externalId);
+        if (!origin) {
+            const dictionaries = this.getDictionariesByTest(test);
+            const namespace = dictionaries.slice(0, -1).join(path_1.default.sep);
+            const classname = dictionaries[dictionaries.length - 1];
+            if (namespace.length > 0) {
+                autotestData.namespace = namespace;
+            }
+            if (classname?.length) {
+                autotestData.classname = classname;
+            }
+        }
         const autotest = converter_1.Converter.convertTestCaseToAutotestPost(autotestData);
-        const steps = [...this.stepsMap.keys()].filter((step) => this.stepsMap.get(step) === test);
-        const stepResults = converter_1.Converter.convertTestStepsToSteps(steps, this.attachmentsMap);
+        const rawSteps = result.steps?.length
+            ? result.steps
+            : [...this.stepsMap.keys()].filter((step) => this.stepsMap.get(step) === test);
+        const stepResults = converter_1.Converter.convertTestStepsToSteps(rawSteps, this.attachmentsMap);
         if (!(0, utils_1.isAllStepsWithPassedOutcome)(stepResults)) {
             result.status = "failed";
         }
-        autotest.steps = converter_1.Converter.convertTestStepsToShortSteps(steps);
+        autotest.steps = converter_1.Converter.convertTestStepsToShortSteps(rawSteps);
         await this.strategy.loadAutotest(autotest, converter_1.Converter.convertStatus(result.status, test.expectedStatus));
         const autotestResult = converter_1.Converter.convertAutotestPostToAutotestResult(autotestData, test, result);
         autotestResult.stepResults = stepResults;

package/dist/utils.d.ts

@@ -11,3 +11,4 @@ export declare function isStep(step: TestStep): boolean;
 export declare function stripAscii(str: string): string;
 export declare const stepAttachRegexp: RegExp;
 export declare function processAttachmentExtensions(attachment: ResultAttachment): ResultAttachment;
+export declare function processAttachmentNameExtensions(name: string, contentType: string): string;

package/dist/utils.js

@@ -6,6 +6,7 @@ exports.isAllStepsWithPassedOutcome = isAllStepsWithPassedOutcome;
 exports.isStep = isStep;
 exports.stripAscii = stripAscii;
 exports.processAttachmentExtensions = processAttachmentExtensions;
+exports.processAttachmentNameExtensions = processAttachmentNameExtensions;
 const converter_1 = require("./converter");
 const labels_1 = require("./labels");
 function getStatusDetails(error) {
@@ -33,14 +34,14 @@ function stripAscii(str) {
 ;
 exports.stepAttachRegexp = /^stepattach_(\w{8}-\w{4}-\w{4}-\w{4}-\w{12})_/i;
 const asciiRegex = new RegExp("[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))", "g");
+const extensionMap = {
+    [labels_1.ContentType.ZIP]: labels_1.Extensions.ZIP,
+    [labels_1.ContentType.PNG]: labels_1.Extensions.PNG,
+    [labels_1.ContentType.WEBM]: labels_1.Extensions.WEBM,
+    [labels_1.ContentType.MD]: labels_1.Extensions.MD,
+    [labels_1.ContentType.JPEG]: labels_1.Extensions.JPEG,
+};
 function processAttachmentExtensions(attachment) {
-    const extensionMap = {
-        [labels_1.ContentType.ZIP]: labels_1.Extensions.ZIP,
-        [labels_1.ContentType.PNG]: labels_1.Extensions.PNG,
-        [labels_1.ContentType.WEBM]: labels_1.Extensions.WEBM,
-        [labels_1.ContentType.MD]: labels_1.Extensions.MD,
-        [labels_1.ContentType.JPEG]: labels_1.Extensions.JPEG,
-    };
     const extension = extensionMap[attachment.contentType];
     if (extension && !attachment.name.includes(extension)) {
         return {
@@ -50,3 +51,10 @@ function processAttachmentExtensions(attachment) {
     }
     return attachment;
 }
+function processAttachmentNameExtensions(name, contentType) {
+    const extension = extensionMap[contentType];
+    if (extension && !name.includes(extension)) {
+        return name + extension;
+    }
+    return name;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testit-adapter-playwright",
-  "version": "3.6.1",
+  "version": "3.7.0-TMS-5.6",
   "description": "Playwright adapter for Test IT",
   "license": "Apache-2.0",
   "author": {
@@ -40,7 +40,7 @@
     "prettier": "^3.0.1"
   },
   "dependencies": {
-    "testit-js-commons": "3.6.1"
+    "testit-js-commons": "3.7.0-TMS-5.6"
   },
   "files": [
     "dist"