playwright-slack-report-burak 3.0.37 → 3.0.39

package/dist/src/ResultsParser.js

@@ -18,9 +18,10 @@ try {
     AdmZip = null;
 }
 
-const SUMMARIES_DIR = path.join('./', 'playwright-report');
+const SUMMARIES_DIR = path.join('./', 'playwright-artifacts');
 const NODE_ARTIFACTS_DIR = path.join(SUMMARIES_DIR, 'nodeArtifacts');
-const FINAL_OUTPUT_DIR = path.join('./', 'finalOutput');
+const PLAYWRIGHT_REPORT_DIR = path.join('./', 'playwright-report');
+const FINAL_OUTPUT_DIR = path.join('./', 'playwright-report');
 
 class ResultsParser {
     result;
@@ -339,38 +340,23 @@ class ResultsParser {
     }
 
     async fetchAllArtifacts() {
-        // Ensure playwright-report directory exists
+        // Ensure summaries directory exists
         if (!fs.existsSync(SUMMARIES_DIR)) {
             fs.mkdirSync(SUMMARIES_DIR, { recursive: true });
         }
         
-        // Create nodeArtifacts directory under playwright-report
+        // Create nodeArtifacts directory under summaries
         if (!fs.existsSync(NODE_ARTIFACTS_DIR)) {
             fs.mkdirSync(NODE_ARTIFACTS_DIR, { recursive: true });
         }
         
-        // Copy artifacts from node 1 to nodeArtifacts
-        // Check multiple potential locations for node 1's blob file
-        const possibleNode1BlobSources = [
-            path.join(SUMMARIES_DIR, 'blob-report-node-1.zip'),
-            path.join('./', 'blob-report-node-1.zip'),
-            path.join(SUMMARIES_DIR, 'blob-report-1.zip'),
-        ];
-        
-        const node1BlobDest = path.join(NODE_ARTIFACTS_DIR, 'blob-report-node-1.zip');
-        let node1BlobCopied = false;
-        
-        for (const source of possibleNode1BlobSources) {
-            if (fs.existsSync(source)) {
-                fs.copyFileSync(source, node1BlobDest);
-                console.log(`Copied ${source} to nodeArtifacts`);
-                node1BlobCopied = true;
-                break;
-            }
-        }
-        
-        if (!node1BlobCopied) {
-            console.warn('Warning: blob-report-node-1.zip not found in expected locations');
+        // Copy entire contents of playwright-report to NODE_ARTIFACTS_DIR
+        const playwrightReportDir = path.join('./', 'playwright-report');
+        if (fs.existsSync(playwrightReportDir)) {
+            this.copyDirectoryRecursive(playwrightReportDir, NODE_ARTIFACTS_DIR);
+            console.log(`Copied entire contents of playwright-report to ${NODE_ARTIFACTS_DIR}`);
+        } else {
+            console.warn('Warning: playwright-report directory not found');
         }
         
         while (!this.allNodeSummaryFilesExist() || !this.allBlobZipsExist()) {
@@ -443,7 +429,7 @@ class ResultsParser {
                     
                     // Extract ZIP and find the specific file
                     const zip = new AdmZip(downloadResponse.data);
-                    const zipEntry = zip.getEntry(file) || zip.getEntry(`playwright-report/${file}`);
+                    const zipEntry = zip.getEntry(file) || zip.getEntry(`playwright-artifacts/${file}`);
                     
                     if (zipEntry) {
                         fs.writeFileSync(filePath, zipEntry.getData());
@@ -471,38 +457,27 @@ class ResultsParser {
     mergeReports() {
       let breakMergeWaiter = false;
       try {
-        // Ensure playwright-report directory exists
-        if (!fs.existsSync(SUMMARIES_DIR)) {
-            fs.mkdirSync(SUMMARIES_DIR, { recursive: true });
-        }
-        
-        // Create finalOutput directory under playwright-report
-        if (!fs.existsSync(FINAL_OUTPUT_DIR)) {
-            fs.mkdirSync(FINAL_OUTPUT_DIR, { recursive: true });
-        }
         
-        // Copy blob files before merging (Playwright merge-reports expects blob files)
-        // We'll copy them to FINAL_OUTPUT_DIR for merging, then extract later for resource copying
-        
-        // Copy all blob zip files to FINAL_OUTPUT_DIR for merging
+        // Copy all blob files to playwright-report before merging
         for (let i = 1; i <= this.totalShardCount; i++) {
             const blobZipFile = path.join(NODE_ARTIFACTS_DIR, `blob-report-node-${i}.zip`);
             if (fs.existsSync(blobZipFile)) {
                 try {
-                    const destFile = path.join(FINAL_OUTPUT_DIR, `blob-report-node-${i}.zip`);
+                    const destFile = path.join(PLAYWRIGHT_REPORT_DIR, `blob-report-node-${i}.zip`);
                     fs.copyFileSync(blobZipFile, destFile);
-                    console.log(`Copied blob-report-node-${i}.zip for merging`);
+                    console.log(`Copied blob-report-node-${i}.zip to playwright-report for merging`);
                 } catch (error) {
                     console.warn(`Failed to copy blob-report-node-${i}.zip for merging:`, error.message);
                 }
             }
         }
         
-        // Execute the command to merge reports IN FINAL_OUTPUT_DIR
-        exec(`npx playwright merge-reports --reporter html ${FINAL_OUTPUT_DIR}`);
+        // Execute the command to merge reports FROM playwright-report
+        // Playwright will output to playwright-report directory
+        exec(`npx playwright merge-reports --reporter html ${PLAYWRIGHT_REPORT_DIR}`);
         
-        // Wait until index.html exists in finalOutput
-        while (!fs.existsSync(path.join(FINAL_OUTPUT_DIR, 'index.html'))) {
+        // Wait until index.html exists in playwright-report
+        while (!fs.existsSync(path.join(PLAYWRIGHT_REPORT_DIR, 'index.html'))) {
           console.log('Waiting 2 seconds for merged html report to be generated...');
           const currentTime = new Date().getTime();
           breakMergeWaiter = false;
@@ -514,15 +489,34 @@ class ResultsParser {
         }
         console.log('Reports merged successfully.');
         
-        // Once merge is complete, unzip all blobs in nodeArtifacts into separate folders
-        this.unzipBlobsAndCopyResources(NODE_ARTIFACTS_DIR, FINAL_OUTPUT_DIR);
+        // After merge, extract all blobs from nodeArtifacts to playwright-report
+        this.unzipBlobsAndCopyResources(NODE_ARTIFACTS_DIR, PLAYWRIGHT_REPORT_DIR);
       } catch (error) {
           // Log a warning instead of throwing an error
           console.warn('Warning: Failed to merge reports. This may not affect the overall process.', error.message);
       }
     }
     
-    unzipBlobsAndCopyResources(nodeArtifactsDir, finalOutputDir) {
+    copyDirectoryRecursive(srcDir, destDir) {
+        if (!fs.existsSync(destDir)) {
+            fs.mkdirSync(destDir, { recursive: true });
+        }
+        
+        const entries = fs.readdirSync(srcDir, { withFileTypes: true });
+        
+        for (const entry of entries) {
+            const srcPath = path.join(srcDir, entry.name);
+            const destPath = path.join(destDir, entry.name);
+            
+            if (entry.isDirectory()) {
+                this.copyDirectoryRecursive(srcPath, destPath);
+            } else {
+                fs.copyFileSync(srcPath, destPath);
+            }
+        }
+    }
+    
+    unzipBlobsAndCopyResources(NODE_ARTIFACTS_DIR, FINAL_OUTPUT_DIR) {
         if (!AdmZip) {
             console.error('adm-zip is required for blob extraction. Please install it: npm install adm-zip');
             return;
@@ -530,9 +524,9 @@ class ResultsParser {
         
         // Unzip all blob files in nodeArtifacts into separate folders
         for (let i = 1; i <= this.totalShardCount; i++) {
-            const blobZipFile = path.join(nodeArtifactsDir, `blob-report-node-${i}.zip`);
+            const blobZipFile = path.join(NODE_ARTIFACTS_DIR, `blob-report-node-${i}.zip`);
             if (fs.existsSync(blobZipFile)) {
-                const extractDir = path.join(nodeArtifactsDir, `node-${i}`);
+                const extractDir = path.join(NODE_ARTIFACTS_DIR, `node-${i}`);
                 if (!fs.existsSync(extractDir)) {
                     fs.mkdirSync(extractDir, { recursive: true });
                 }
@@ -550,7 +544,7 @@ class ResultsParser {
                         
                         if (zipFiles.length > 0) {
                             // Copy the resources folder to finalOutput
-                            const finalResourcesDir = path.join(finalOutputDir, 'resources');
+                            const finalResourcesDir = path.join(FINAL_OUTPUT_DIR, 'resources');
                             if (!fs.existsSync(finalResourcesDir)) {
                                 fs.mkdirSync(finalResourcesDir, { recursive: true });
                             }

package/package.json

@@ -32,7 +32,7 @@
     "lint-fix": "npx eslint . --ext .ts --fix"
   },
   "name": "playwright-slack-report-burak",
-  "version": "3.0.37",
+  "version": "3.0.39",
   "main": "index.js",
   "types": "dist/index.d.ts",
   "author": "Burak B. <burak.boluk@hotmail.com>",