playwright-slack-report-burak 2.2.2 → 2.3.1

package/dist/src/ResultsParser.js

@@ -53,52 +53,43 @@ class ResultsParser {
         const totalTestCasesForNode = this.result.reduce((acc, suite) => acc + suite.testSuite.tests.length, 0);
 
         // Initialize or read existing summary from file
-        let nodeSummary = {
+        const nodeSummary = {
             total: totalTestCasesForNode,
-            passed: 0,
-            failed: 0,
-            flaky: 0,
+            passed: passes.length,
+            failed: failures.length,
+            flaky: (this.separateFlakyTests && flakes.length > 0) ?
+                flakes.length : 0,
             skipped: 0,
-            failures: [],
+            failures,
             tests: [],
         };
-
-        // Create the file if it doesn't exist
-        if (!fs.existsSync(nodeSummaryFile)) {
-            fs.writeFileSync(nodeSummaryFile, JSON.stringify(nodeSummary, null, 2));
-        } else {
-            nodeSummary = JSON.parse(fs.readFileSync(nodeSummaryFile, 'utf-8'));
-        }
-
-        // Update the node summary with new test results
         for (const suite of this.result) {
-            nodeSummary.tests = nodeSummary.tests.concat(suite.testSuite.tests);
+          nodeSummary.tests = nodeSummary.tests.concat(suite.testSuite.tests);
             for (const test of suite.testSuite.tests) {
                 if (test.status === 'skipped') {
                     nodeSummary.skipped += 1;
                 }
-                if (test.status === 'failed' || test.status === 'timedOut') {
-                    nodeSummary.failed += 1;
-                }
-                if (this.separateFlakyTests && test.status === 'passed' && test.retry > 0) {
-                    nodeSummary.flaky += 1;
-                }
-                if (test.status === 'passed' && (!this.separateFlakyTests || test.retry === 0)) {
-                    nodeSummary.passed += 1;
-                }
             }
         }
 
-        // Write the updated summary back to the file for the current node
+        // Create the file
         fs.writeFileSync(nodeSummaryFile, JSON.stringify(nodeSummary, null, 2));
 
         if (this.shardIndex === 0 && this.totalShardCount > 1) {
-          await this.fetchAllArtifacts();
+          if (process.env.CI) {
+            console.log('Fetching all artifacts...');
+            await this.fetchAllArtifacts();
+          } else {
+            while (!this.allNodeSummaryFilesExist() || !this.allBlobZipsExist()) {
+              console.log('Waiting for all both to exist...');
+              await new Promise(resolve => setTimeout(resolve, 1000)); // Wait for 1 second
+            }
+          }
         }
 
         console.log('Contents of playwright-report for node', this.shardIndex, ':', fs.readdirSync(summariesDir));
 
-        if (this.allNodeSummaryFilesExist() && this.allBlobZipsExist() && this.shardIndex === 0) {
+        if (this.shardIndex === 0 && this.allNodeSummaryFilesExist() && this.allBlobZipsExist()) {
             // Merge all node summaries into the final summary
             for (let i = 0; i < this.totalShardCount; i++) {
                 const nodeSummaryFile = path.join(summariesDir, `node_summary_${i}.json`);
@@ -301,7 +292,7 @@ class ResultsParser {
 
     async fetchArtifact(i, file, summariesDir) {
         const circleciToken = process.env.safetywingtest_CIRCLECI_API_TOKEN;
-        const circleciJobId = process.env.CIRCLE_WORKFLOW_JOB_ID || '5175a4cb-273e-42fd-a5a6-40c3dc31c9de';
+        const circleciJobId = process.env.CIRCLE_WORKFLOW_JOB_ID || '8133c154-ceb3-466c-b4e1-d3d8768b60fa';
         const circleciApiUrl = `https://output.circle-artifacts.com/output/job/${circleciJobId}/artifacts/${i}/html-report/${file}`;
         const filePath = path.join(summariesDir, file);
 
@@ -329,13 +320,20 @@ class ResultsParser {
         }
     }
     mergeReports() {
+      let breakMergeWaiter = false;
       try {
         // Execute the command to merge reports
         exec(`npx playwright merge-reports --reporter html -c ./playwright-report playwright-report`);
         // Wait until index.html exists
         while (!fs.existsSync(path.join('./playwright-report', 'index.html'))) {
-          console.log('Waiting for merged html report to be generated...');
-          setTimeout(() => {}, 3000);
+          console.log('Waiting 2 seconds for merged html report to be generated...');
+          const currentTime = new Date().getTime();
+          breakMergeWaiter = false;
+          while (!breakMergeWaiter) {
+            if(new Date().getTime() - currentTime > 2000) {
+              breakMergeWaiter = true;
+            }
+          }
         }
         console.log('Reports merged successfully.');
         console.log('Contents of playwright-report:', fs.readdirSync('./playwright-report'));

package/dist/src/SlackReporter.js

@@ -71,7 +71,7 @@ class SlackReporter {
             return;
         }
         const resultSummary = await this.resultsParser.getParsedResults();
-        // SHARDING SUPPORT - Stop slack messages for non-zero index node
+        // SHARDING SUPPORT - Stop slack messages for non-zero index node(s)
         if (process.env.CIRCLE_NODE_INDEX && process.env.CIRCLE_NODE_INDEX !== '0') {
             this.log(`❌ Stopping reporter for non-zero index node ${process.env.CIRCLE_NODE_INDEX} of ${process.env.CIRCLE_NODE_TOTAL}`);
             return;

package/package.json

@@ -30,7 +30,7 @@
     "lint-fix": "npx eslint . --ext .ts --fix"
   },
   "name": "playwright-slack-report-burak",
-  "version": "2.2.2",
+  "version": "2.3.1",
   "main": "index.js",
   "types": "dist/index.d.ts",
   "repository": "git@github.com:ryanrosello-og/playwright-slack-report.git",