@testomatio/reporter 1.2.0-beta-1 → 1.2.0-beta-2

package/lib/pipe/html.js

@@ -5,7 +5,7 @@ const path = require('path');
 const chalk = require('chalk');
 const handlebars = require('handlebars');
 
-const { fileSystem, isSameTest } = require('../utils/utils');
+const { fileSystem, isSameTest, ansiRegExp } = require('../utils/utils');
 const { HTML_REPORT } = require('../constants');
 
 class HtmlPipe {
@@ -74,6 +74,8 @@ class HtmlPipe {
     addTest(test) {
         if (!this.isEnabled) return;
 
+        if (!test.steps || !test.status) return;
+
         const index = this.tests.findIndex(t => isSameTest(t, test));
         // update if they were already added
         if (index >= 0) {
@@ -88,6 +90,37 @@ class HtmlPipe {
         if (!this.isEnabled) return;
 
         if (this.isHtml) {
+
+            this.tests.forEach(test => {
+
+                if (!test.message || test.message.trim() === "") {
+                    test.message = "This test has no 'message' code";
+                }
+    
+                if (!test.suite_title || test.suite_title.trim() === "") {
+                    test.suite_title = "Unknown suite";
+                }
+
+                if (!test.title || test.title.trim() === "") {
+                    test.title = "Unknown test title";
+                }
+
+                if (!test.files || test.files.length === 0) {
+                    test.files = "This test has no files";
+                }
+
+                if (test.steps) {
+                    if (!test.steps || test.steps.trim() === "") {
+                        test.steps = "This test has no 'steps' code";
+                    }
+                    else {
+                        test.steps = this.#removeAnsiColorCodes(test.steps);
+                    }
+                }
+                
+                // TODO: u can added an additional test values to this checks in the future
+            });
+
             this.data = {
                 runId: this.store.runId,
                 status: runParams.status,
@@ -142,7 +175,49 @@ class HtmlPipe {
             tests.filter(test => test.status.toLowerCase() === status.toLowerCase()).length
         );
 
-        handlebars.registerHelper('json', (obj) => JSON.stringify(obj));
+        handlebars.registerHelper('json', (tests) => {
+            function replaceScriptTagsInArray(array) {
+                return array.map(obj => {
+                    const keysToCheck = ["steps", "stack", "title", "suite_title", "message", "code"];
+                    const newObj = {};
+            
+                    for (const key in obj) {
+                        if (Object.prototype.hasOwnProperty.call(obj, key)) {
+                            if (key === "example") {
+                                newObj[key] = {};
+                                for (const subKey in obj[key]) {
+                                    if (Object.prototype.hasOwnProperty.call(obj[key], subKey)) {
+                                        newObj[key][subKey] = typeof obj[key][subKey] === "string"
+                                            ? obj[key][subKey]
+                                                .replace(/<script>/g, "<$cript>")
+                                                .replace(/<\/script>/g, "</$cript>")
+                                            : obj[key][subKey];
+                                    }
+                                }
+                            } else if (keysToCheck.includes(key)) {
+                                newObj[key] = typeof obj[key] === "string"
+                                    ? obj[key].replace(/<script>/g, "<$cript>").replace(/<\/script>/g, "</$cript>")
+                                    : obj[key];
+                            } else {
+                                newObj[key] = obj[key];
+                            }
+                        }
+                    }
+            
+                    return newObj;
+                });
+            }
+
+            // Remove ANSI escape codes
+            return JSON.stringify(replaceScriptTagsInArray(tests));
+        });
+    }
+
+    #removeAnsiColorCodes(str) {
+        let updatedStr = str.replace(ansiRegExp(), "");        
+        updatedStr = updatedStr.replace(/\n/g, '<br>');
+
+        return updatedStr;
     }
 
     toString() {

package/lib/template/testomatio.hbs

@@ -471,8 +471,8 @@
         }        
 
         // processing and adding test data to the template
-        function addOneTest(category,testInfo = {}){
-            const { suite, title, steps, message, files } = testInfo;
+        function addOneTest(category,testData = {}){
+            const { suite_title, title, steps, message, files } = testData;
             // radio btn test's count
             function incrementCount(element) {
                 let count = parseInt(element.textContent);
@@ -562,7 +562,7 @@
 
             const testitem__name = clone.querySelector('.testitem__name');
 
-            const fullTestName = suite ? suite + " - " + title : title;
+            const fullTestName = suite_title ? suite_title + " - " + title : title;
             testitem__name.textContent = fullTestName;
 
             const body = clone.querySelector('.testitem__body');
@@ -579,11 +579,16 @@
 
             let content_files = content.querySelector('div[type="files"]').querySelector('span');
 
-            if (files && files.length > 0) {
+            if (files.includes("This test has no files")) {
+                content_files.innerHTML = files;
+            }
+
+            if (!files.includes("This test has no files")) {
                 const filesList = document.createElement('ul');
                 content_files.innerHTML = "";
 
-                files.forEach((file) => {
+                if (Array.isArray(files) && files.length > 0) {
+                    files.forEach((file) => {
                     const listItem = document.createElement('li');
                     const fileLink = document.createElement('a');
                     fileLink.href = file.path;
@@ -594,10 +599,9 @@
                     filesList.appendChild(listItem);
                 });
 
-                content_files.appendChild(filesList);                
-            }
-            else {
-                content_files.innerHTML = "Files are not found for this test";
+                content_files.appendChild(filesList);
+
+                }                
             }
 
             const testitem__top = clone.querySelector('.testitem__top');
@@ -680,40 +684,11 @@
         search();        
 
         const executedTests = {{{ json tests }}};
-
-        // TODO: move to HTML pipe
-        function removeAnsiColorCodes(text) {
-            text = text.replace(/\u001b\[[0-9;]*m/g, '');
-            text = text.replace(/\n/g, '<br>');
-            
-            return text;
-        }
         
         for (let i = 0; i < executedTests.length; i++) {
             const status = executedTests[i].status;
-            const testInfo = {
-                suite: executedTests[i].suite_title,
-                title: executedTests[i].title,
-                steps: removeAnsiColorCodes(executedTests[i].steps),
-                message: executedTests[i].message,
-                files: executedTests[i].files,
-                status: status,
-            }
-
-            if (!testInfo.steps && testInfo.steps.trim() === "") {
-                testInfo.steps = "Step code is not found for this test";
-            }
-
-            if (!testInfo.message && testInfo.message.trim() === "") {
-                testInfo.message = "Message code is not found for this test";
-            }
-
-            if (!testInfo.suite && testInfo.suite.trim() === "") {
-                testInfo.suite = "Unknown suite";
-            }
 
-            // call the addOneTest() function for each test
-            addOneTest(status, testInfo);
+            addOneTest(status, executedTests[i]);
         }
     </script>
 </body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "1.2.0-beta-1",
+  "version": "1.2.0-beta-2",
   "description": "Testomatio Reporter Client",
   "main": "./lib/reporter.js",
   "typings": "typings/index.d.ts",