cypress-qase-reporter 3.0.1 → 3.0.2

package/changelog.md

@@ -1,3 +1,9 @@
+# cypress-qase-reporter@3.0.2
+
+## What's new
+
+- Fixed an issue where video attachments were not uploaded for tests located in subdirectories.
+
 # cypress-qase-reporter@3.0.0-beta.1
 
 ## What's new

package/dist/fileSearcher.d.ts

@@ -24,8 +24,9 @@ export declare class FileSearcher {
      *
      * @param videoFolderPath Path to the folder with video files.
      * @param specFileName Name of the spec file (without extension).
+     * @param specRelativePath Optional relative path from e2e directory to the spec file.
      * @returns Array of absolute paths to the matching mp4 files.
      */
-    static findVideoFiles(videoFolderPath: string, specFileName: string): string[];
+    static findVideoFiles(videoFolderPath: string, specFileName: string, specRelativePath?: string): string[];
     private static findFolderByName;
 }

package/dist/fileSearcher.js

@@ -114,24 +114,47 @@ class FileSearcher {
      *
      * @param videoFolderPath Path to the folder with video files.
      * @param specFileName Name of the spec file (without extension).
+     * @param specRelativePath Optional relative path from e2e directory to the spec file.
      * @returns Array of absolute paths to the matching mp4 files.
      */
-    static findVideoFiles(videoFolderPath, specFileName) {
+    static findVideoFiles(videoFolderPath, specFileName, specRelativePath) {
         const absolutePath = path.resolve(process.cwd(), videoFolderPath);
         const result = [];
         if (!fs.existsSync(absolutePath)) {
             return result;
         }
-        const entries = fs.readdirSync(absolutePath, { withFileTypes: true });
-        for (const entry of entries) {
-            if (entry.isFile()) {
-                const fileName = entry.name;
-                // Check if the file is an mp4 video file with the expected format: {specFileName}.cy.js.mp4
-                if (fileName.toLowerCase().endsWith('.mp4') && fileName.startsWith(specFileName)) {
-                    const entryPath = path.join(absolutePath, fileName);
-                    result.push(entryPath);
+        // Recursively search for video files in all subdirectories
+        const findVideoFilesRecursively = (dir) => {
+            const entries = fs.readdirSync(dir, { withFileTypes: true });
+            for (const entry of entries) {
+                if (entry.isFile()) {
+                    const fileName = entry.name;
+                    // Check if the file is an mp4 video file with the expected format: {specFileName}.cy.js.mp4
+                    if (fileName.toLowerCase().endsWith('.mp4') && fileName.startsWith(specFileName)) {
+                        const entryPath = path.join(dir, fileName);
+                        result.push(entryPath);
+                    }
+                }
+                else if (entry.isDirectory()) {
+                    const subDirPath = path.join(dir, entry.name);
+                    findVideoFilesRecursively(subDirPath);
                 }
             }
+        };
+        // If we have a relative path, prioritize the corresponding subdirectory
+        if (specRelativePath) {
+            const specDir = path.dirname(specRelativePath);
+            // Only process if specDir is not the current directory ('.')
+            if (specDir !== '.') {
+                const videoSubDir = path.join(absolutePath, specDir);
+                if (fs.existsSync(videoSubDir)) {
+                    findVideoFilesRecursively(videoSubDir);
+                }
+            }
+        }
+        // If we didn't find files in the expected subdirectory, search the entire videos directory
+        if (result.length === 0) {
+            findVideoFilesRecursively(absolutePath);
         }
         return result;
     }

package/dist/hooks.js

@@ -68,8 +68,13 @@ async function afterSpecHook(spec, options) {
         const uploadDelay = composedOptions.framework?.cypress?.uploadDelay ?? 10;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const specFileName = path_1.default.basename(spec.name, '.cy.js');
+        // Get the relative path from the spec.relative field
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        const specRelativePath = spec.relative && spec.relative !== '__all'
+            ? spec.relative.replace(/^cypress\/(e2e|integration)\//, '') // Remove cypress/e2e/ or cypress/integration/ prefix
+            : undefined;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        const videoFiles = videosFolder ? fileSearcher_1.FileSearcher.findVideoFiles(videosFolder, specFileName) : [];
+        const videoFiles = videosFolder ? fileSearcher_1.FileSearcher.findVideoFiles(videosFolder, specFileName, specRelativePath) : [];
         if (videoFiles.length > 0 && uploadVideos) {
             const existingVideoFiles = videoFiles.filter(file => fs_1.default.existsSync(file));
             if (existingVideoFiles.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress-qase-reporter",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Qase Cypress Reporter",
   "homepage": "https://github.com/qase-tms/qase-javascript",
   "sideEffects": false,