fix: mochawesome helper with unique screenshots

Author: Lando1n

lib/helper/Mochawesome.js

@@ -51,11 +51,10 @@ class Mochawesome extends Helper {
       fileName = clearString(`${test.title}_${currentTest.test.title}`)
     } else {
       currentTest = { test }
-      fileName = `${testToFileName(test)}`
+      fileName = testToFileName(test)
     }
     if (this.options.uniqueScreenshotNames) {
-      const uuid = test.uuid || test.ctx.test.uuid
-      fileName = `${fileName.substring(0, 10)}_${uuid}`
+      fileName = testToFileName(test, { unique: true })
     }
     if (test._retries < 1 || test._retries === test.retryNum) {
       fileName = `${fileName}.failed.png`

lib/mocha/test.js

@@ -135,9 +135,19 @@ function cloneTest(test) {
   return deserializeTest(serializeTest(test))
 }
 
-function testToFileName(test, suffix = '') {
+/**
+ * Get a filename from the test object
+ * @param {CodeceptJS.Test} test
+ * @param {Object}  options
+ * @param {string}  options.suffix Add a suffix to the filename
+ * @param {boolean} options.unique Add a unique suffix to the file
+ *
+ * @returns {string} the filename
+ */
+function testToFileName(test, { suffix = '', unique = false } = {}) {
   let fileName = test.title
 
+  if (unique) fileName += `_${test?.uid || Math.floor(new Date().getTime() / 1000)}`
   if (suffix) fileName = `${fileName}_${suffix}`
   // remove tags with empty string (disable for now)
   // fileName = fileName.replace(/\@\w+/g, '')
@@ -151,6 +161,7 @@ function testToFileName(test, suffix = '') {
   //   fileName = `${clearString(test.parent.title)}_${fileName}`
   // }
   fileName = clearString(fileName).slice(0, 100)
+
   return fileName
 }
 

lib/plugin/screenshotOnFail.js

@@ -86,7 +86,7 @@ module.exports = function (config) {
         let fileName
 
         if (options.uniqueScreenshotNames && test) {
-          fileName = `${testToFileName(test, _getUUID(test))}.failed.png`
+          fileName = `${testToFileName(test, { unique: true })}.failed.png`
         } else {
           fileName = `${testToFileName(test)}.failed.png`
         }
@@ -137,12 +137,4 @@ module.exports = function (config) {
       true,
     )
   })
-
-  function _getUUID(test) {
-    if (test.uid) {
-      return test.uid
-    }
-
-    return Math.floor(new Date().getTime() / 1000)
-  }
 }