testit-js-commons 3.7.6 → 3.7.8

package/lib/common/utils/html-escape.util.js

@@ -6,6 +6,7 @@ exports.escapeHtmlInObjectArray = escapeHtmlInObjectArray;
 const NO_ESCAPE_HTML_ENV_VAR = 'NO_ESCAPE_HTML';
 // Regex pattern to detect HTML tags
 const HTML_TAG_PATTERN = /<\S.*?(?:>|\/>)/;
+const NO_ESCAPE_KEYS = new Set(['externalId', 'autoTestExternalId']);
 // Regex patterns to escape only non-escaped characters
 const LESS_THAN_PATTERN = /</;
 const GREATER_THAN_PATTERN = />/;
@@ -85,6 +86,9 @@ function processProperties(obj) {
             try {
                 const value = obj[key];
                 if (typeof value === 'string') {
+                    if (NO_ESCAPE_KEYS.has(key)) {
+                        continue;
+                    }
                     // Escape string properties
                     obj[key] = escapeHtmlTags(value);
                 }

package/lib/common/utils/html-escape.util.test.js

@@ -9,17 +9,17 @@ describe('HtmlEscapeUtils', () => {
     describe('escapeHtmlTags', () => {
         it('should escape < and > characters', () => {
             const input = 'Hello <script>alert("XSS")</script> world';
-            const expected = 'Hello \\<script\\>alert("XSS")\\</script\\> world';
+            const expected = 'Hello &lt;script&gt;alert("XSS")</script> world';
             expect((0, html_escape_util_1.escapeHtmlTags)(input)).toBe(expected);
         });
         it('should not escape already escaped characters', () => {
             const input = 'Already \\<escaped\\> tags';
-            const expected = 'Already \\<escaped\\> tags';
+            const expected = 'Already \\&lt;escaped\\&gt; tags';
             expect((0, html_escape_util_1.escapeHtmlTags)(input)).toBe(expected);
         });
         it('should handle mixed escaped and unescaped characters', () => {
             const input = 'Mixed \\<escaped\\> and <unescaped> tags';
-            const expected = 'Mixed \\<escaped\\> and \\<unescaped\\> tags';
+            const expected = 'Mixed \\&lt;escaped\\&gt; and <unescaped> tags';
             expect((0, html_escape_util_1.escapeHtmlTags)(input)).toBe(expected);
         });
         it('should return null for null input', () => {
@@ -45,17 +45,17 @@ describe('HtmlEscapeUtils', () => {
         });
         it('should escape only when HTML tags are present', () => {
             const input = 'Price < $100 and <script>alert("test")</script>';
-            const expected = 'Price \\< $100 and \\<script\\>alert("test")\\</script\\>';
+            const expected = 'Price &lt; $100 and <script&gt;alert("test")</script>';
             expect((0, html_escape_util_1.escapeHtmlTags)(input)).toBe(expected);
         });
         it('should detect self-closing tags', () => {
             const input = 'Image: <img src="test.jpg"/> and text';
-            const expected = 'Image: \\<img src="test.jpg"/\\> and text';
+            const expected = 'Image: &lt;img src="test.jpg"/&gt; and text';
             expect((0, html_escape_util_1.escapeHtmlTags)(input)).toBe(expected);
         });
         it('should detect tags with attributes', () => {
             const input = 'Link: <a href="http://example.com">click here</a>';
-            const expected = 'Link: \\<a href="http://example.com"\\>click here\\</a\\>';
+            const expected = 'Link: &lt;a href="http://example.com"&gt;click here</a>';
             expect((0, html_escape_util_1.escapeHtmlTags)(input)).toBe(expected);
         });
         it('should not process malformed tags without proper structure', () => {
@@ -71,10 +71,21 @@ describe('HtmlEscapeUtils', () => {
                 count: 123
             };
             const result = (0, html_escape_util_1.escapeHtmlInObject)(input);
-            expect(result.name).toBe('Test \\<script\\>');
-            expect(result.description).toBe('Description with \\<tags\\>');
+            expect(result.name).toBe('Test &lt;script&gt;');
+            expect(result.description).toBe('Description with &lt;tags&gt;');
             expect(result.count).toBe(123);
         });
+        it('should not escape externalId and autoTestExternalId', () => {
+            const input = {
+                externalId: '<test>',
+                autoTestExternalId: '<auto>',
+                name: 'Name <b>bold</b>',
+            };
+            const result = (0, html_escape_util_1.escapeHtmlInObject)(input);
+            expect(result.externalId).toBe('<test>');
+            expect(result.autoTestExternalId).toBe('<auto>');
+            expect(result.name).toBe('Name &lt;b&gt;bold</b>');
+        });
         it('should handle nested objects', () => {
             const input = {
                 title: 'Main <title>',
@@ -84,8 +95,8 @@ describe('HtmlEscapeUtils', () => {
                 }
             };
             const result = (0, html_escape_util_1.escapeHtmlInObject)(input);
-            expect(result.title).toBe('Main \\<title\\>');
-            expect(result.nested.subtitle).toBe('Sub \\<title\\>');
+            expect(result.title).toBe('Main &lt;title&gt;');
+            expect(result.nested.subtitle).toBe('Sub &lt;title&gt;');
             expect(result.nested.value).toBe(42);
         });
         it('should handle arrays of strings', () => {
@@ -93,7 +104,7 @@ describe('HtmlEscapeUtils', () => {
                 tags: ['<tag1>', '<tag2>', 'normal']
             };
             const result = (0, html_escape_util_1.escapeHtmlInObject)(input);
-            expect(result.tags).toEqual(['\\<tag1\\>', '\\<tag2\\>', 'normal']);
+            expect(result.tags).toEqual(['&lt;tag1&gt;', '&lt;tag2&gt;', 'normal']);
         });
         it('should handle arrays of objects', () => {
             const input = {
@@ -103,8 +114,8 @@ describe('HtmlEscapeUtils', () => {
                 ]
             };
             const result = (0, html_escape_util_1.escapeHtmlInObject)(input);
-            expect(result.items[0].name).toBe('\\<item1\\>');
-            expect(result.items[1].name).toBe('\\<item2\\>');
+            expect(result.items[0].name).toBe('&lt;item1&gt;');
+            expect(result.items[1].name).toBe('&lt;item2&gt;');
         });
         it('should handle null and undefined values', () => {
             const input = {
@@ -115,7 +126,7 @@ describe('HtmlEscapeUtils', () => {
             const result = (0, html_escape_util_1.escapeHtmlInObject)(input);
             expect(result.nullValue).toBeNull();
             expect(result.undefinedValue).toBeUndefined();
-            expect(result.text).toBe('\\<script\\>');
+            expect(result.text).toBe('&lt;script&gt;');
         });
         it('should return null for null input', () => {
             expect((0, html_escape_util_1.escapeHtmlInObject)(null)).toBeNull();
@@ -136,7 +147,7 @@ describe('HtmlEscapeUtils', () => {
                 name: 'Test <script>'
             };
             const result = (0, html_escape_util_1.escapeHtmlInObject)(input);
-            expect(result.name).toBe('Test \\<script\\>');
+            expect(result.name).toBe('Test &lt;script&gt;');
         });
         it('should handle simple types without modification', () => {
             expect((0, html_escape_util_1.escapeHtmlInObject)('simple string')).toBe('simple string');
@@ -152,9 +163,9 @@ describe('HtmlEscapeUtils', () => {
                 { name: '<item2>', value: 2 }
             ];
             const result = (0, html_escape_util_1.escapeHtmlInObjectArray)(input);
-            expect(result === null || result === void 0 ? void 0 : result[0].name).toBe('\\<item1\\>');
+            expect(result === null || result === void 0 ? void 0 : result[0].name).toBe('&lt;item1&gt;');
             expect(result === null || result === void 0 ? void 0 : result[0].value).toBe(1);
-            expect(result === null || result === void 0 ? void 0 : result[1].name).toBe('\\<item2\\>');
+            expect(result === null || result === void 0 ? void 0 : result[1].name).toBe('&lt;item2&gt;');
             expect(result === null || result === void 0 ? void 0 : result[1].value).toBe(2);
         });
         it('should return null for null input', () => {
@@ -190,10 +201,10 @@ describe('HtmlEscapeUtils', () => {
                 }
             ];
             const result = (0, html_escape_util_1.escapeHtmlInObjectArray)(input);
-            expect(result === null || result === void 0 ? void 0 : result[0].title).toBe('\\<Title\\>');
-            expect(result === null || result === void 0 ? void 0 : result[0].items).toEqual(['\\<tag1\\>', '\\<tag2\\>']);
-            expect(result === null || result === void 0 ? void 0 : result[0].nested.subtitle).toBe('\\<Subtitle\\>');
-            expect(result === null || result === void 0 ? void 0 : result[0].nested.data[0].field).toBe('\\<Field\\>');
+            expect(result === null || result === void 0 ? void 0 : result[0].title).toBe('&lt;Title&gt;');
+            expect(result === null || result === void 0 ? void 0 : result[0].items).toEqual(['&lt;tag1&gt;', '&lt;tag2&gt;']);
+            expect(result === null || result === void 0 ? void 0 : result[0].nested.subtitle).toBe('&lt;Subtitle&gt;');
+            expect(result === null || result === void 0 ? void 0 : result[0].nested.data[0].field).toBe('&lt;Field&gt;');
         });
     });
     describe('Edge cases and error handling', () => {
@@ -217,7 +228,7 @@ describe('HtmlEscapeUtils', () => {
                 name: '<test>'
             };
             const result = (0, html_escape_util_1.escapeHtmlInObject)(maliciousObj);
-            expect(result.name).toBe('\\<test\\>');
+            expect(result.name).toBe('&lt;test&gt;');
         });
         it('should handle mixed content with and without HTML tags', () => {
             const mixedContent = {
@@ -227,7 +238,7 @@ describe('HtmlEscapeUtils', () => {
             };
             const result = (0, html_escape_util_1.escapeHtmlInObject)(mixedContent);
             expect(result.safeText).toBe('Price: 10 < 20'); // No escaping
-            expect(result.htmlContent).toBe('Click \\<button\\>here\\</button\\>'); // Escaped
+            expect(result.htmlContent).toBe('Click &lt;button&gt;here</button>'); // Escaped
             expect(result.mathExpression).toBe('Result: x > 5'); // No escaping
         });
     });

package/lib/services/autotests/autotests.service.js

@@ -82,21 +82,23 @@ class AutotestsService extends common_1.BaseService {
     }
     loadAutotest(autotest, status) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const originAutotest = yield this.getAutotestByExternalId(autotest.externalId);
             if (!originAutotest) {
                 yield this.createAutotest(autotest);
                 return;
             }
+            const mergedAutotest = Object.assign(Object.assign({}, autotest), { namespace: (_a = autotest.namespace) !== null && _a !== void 0 ? _a : originAutotest.namespace, classname: (_b = autotest.classname) !== null && _b !== void 0 ? _b : originAutotest.classname });
             switch (status) {
                 case autotests_type_1.Status.PASSED:
-                    yield this.updateAutotest(autotest);
+                    yield this.updateAutotest(mergedAutotest);
                     return;
                 case autotests_type_1.Status.FAILED:
-                    yield this.updateAutotestFromFailed(originAutotest, autotest);
+                    yield this.updateAutotestFromFailed(originAutotest, mergedAutotest);
                     return;
                 case autotests_type_1.Status.SKIPPED:
                     if (originAutotest.name != undefined && originAutotest.externalId != undefined) {
-                        yield this.updateAutotestFromFailed(originAutotest, autotest);
+                        yield this.updateAutotestFromFailed(originAutotest, mergedAutotest);
                         return;
                     }
                     console.log(`Cannot update skipped autotest ${autotest.name} without name or externalId`);

package/lib/services/testresults/testresults.converter.js

@@ -10,7 +10,8 @@ class TestResultsConverter extends common_1.BaseConverter {
         const model = {
             testRunIds: [this.config.testRunId],
             configurationIds: [this.config.configurationId],
-            statusCodes: ["InProgress"],
+            statusTypes: ["InProgress"],
+            statusCodes: undefined,
             outcomes: undefined,
             failureCategories: undefined,
             namespace: undefined,

package/lib/services/testruns/testruns.converter.d.ts

@@ -1,5 +1,5 @@
 import { AutoTestResultsForTestRunModel, TestRunState, TestRunV2ApiResult } from "testit-api-client";
-import { BaseConverter, AdapterConfig } from "../../common";
+import { BaseConverter, AdapterConfig, Outcome } from "../../common";
 import { AutotestResult, RunState, TestRunGet } from "./testruns.type";
 export interface ITestRunConverter {
     toOriginState(state: RunState): TestRunState;
@@ -12,6 +12,7 @@ export declare class TestRunConverter extends BaseConverter implements ITestRunC
     constructor(config: AdapterConfig);
     toLocalState(state: TestRunState): RunState;
     toOriginState(state: RunState): TestRunState;
+    mapToStatusType(status: Outcome): string;
     toOriginAutotestResult(autotest: AutotestResult): AutoTestResultsForTestRunModel;
     toLocalTestRun(testRun: TestRunV2ApiResult): TestRunGet;
 }

package/lib/services/testruns/testruns.converter.js

@@ -17,13 +17,23 @@ class TestRunConverter extends common_1.BaseConverter {
         // @ts-ignore
         return testit_api_client_1.TestRunState[state];
     }
+    mapToStatusType(status) {
+        const statusMap = {
+            Passed: "Succeeded",
+            Failed: "Failed",
+            Blocked: "Incomplete",
+            Skipped: "Incomplete"
+        };
+        return statusMap[status];
+    }
     toOriginAutotestResult(autotest) {
         var _a, _b, _c, _d;
         const model = {
             configurationId: this.config.configurationId,
             autoTestExternalId: autotest.autoTestExternalId,
             links: (_a = autotest.links) === null || _a === void 0 ? void 0 : _a.map((link) => this.toOriginLink(link)),
-            statusCode: autotest.outcome,
+            statusType: this.mapToStatusType(autotest.outcome),
+            statusCode: null,
             stepResults: (_b = autotest.stepResults) === null || _b === void 0 ? void 0 : _b.map((step) => this.toOriginStep(step)),
             setupResults: (_c = autotest.setupResults) === null || _c === void 0 ? void 0 : _c.map((step) => this.toOriginStep(step)),
             teardownResults: (_d = autotest.teardownResults) === null || _d === void 0 ? void 0 : _d.map((step) => this.toOriginStep(step)),

package/lib/services/testruns/testruns.service.d.ts

@@ -12,5 +12,5 @@ export declare class TestRunsService extends BaseService implements ITestRunsSer
     updateTestRun(testRun: TestRunGet): Promise<void>;
     startTestRun(testRunId: TestRunId): Promise<void>;
     completeTestRun(testRunId: TestRunId): Promise<void>;
-    loadAutotests(testRunId: string, autotests: Array<AutotestResult>): Promise<void>;
+    loadAutotests(testRunId: string, results: Array<AutotestResult>): Promise<void>;
 }

package/lib/services/testruns/testruns.service.js

@@ -138,11 +138,11 @@ class TestRunsService extends common_1.BaseService {
             }
         });
     }
-    loadAutotests(testRunId, autotests) {
+    loadAutotests(testRunId, results) {
         return __awaiter(this, void 0, void 0, function* () {
-            const autotestResults = autotests.map((test) => this._converter.toOriginAutotestResult(test));
-            (0, utils_1.escapeHtmlInObjectArray)(autotestResults);
-            for (const autotestResult of autotestResults) {
+            const autotestResultsForTestRun = results.map((result) => this._converter.toOriginAutotestResult(result));
+            (0, utils_1.escapeHtmlInObjectArray)(autotestResultsForTestRun);
+            for (const autotestResult of autotestResultsForTestRun) {
                 yield this._client.setAutoTestResultsForTestRun(testRunId, { autoTestResultsForTestRunModel: [autotestResult] });
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testit-js-commons",
-  "version": "3.7.6",
+  "version": "3.7.8",
   "description": "JavaScript commons for Test IT",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "dotenv": "^16.0.3",
-    "testit-api-client": "7.2.1"
+    "testit-api-client": "7.2.6"
   },
   "files": [
     "lib"