cypress-plugin-last-failed 1.1.0 → 1.2.0

package/.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Output the file contents 📝
         if: always()
         run: |
-          cat ./test-results/last-run.txt
+          cat ./test-results/last-run.json
       - name: Custom tests 🧪
         if: always()
         uses: cypress-io/github-action@v6

package/README.md

@@ -201,7 +201,7 @@ jobs:
       - name: Output the file contents 📝
         if: always()
         run: |
-          cat ./test-results/last-run.txt
+          cat ./test-results/last-run.json
       - name: Custom tests 🧪
         if: always()
         uses: cypress-io/github-action@v6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress-plugin-last-failed",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Cypress plugin to rerun last failed tests in cypress run and open mode",
   "main": "./src/index.js",
   "scripts": {

package/runFailed.js

@@ -10,20 +10,37 @@ async function runLastFailed() {
 Ensure you are in the directory of your cypress config
 Try running tests again with cypress run`;
 
-  const failedTestFilePath = `${appDir}/test-results/last-run.txt`;
+  const failedTestFilePath = `${appDir}/test-results/last-run.json`;
 
   if (fs.existsSync(failedTestFilePath)) {
     // Retrieve the failedTests from the file
     const failedTests = await fs.promises.readFile(failedTestFilePath, 'utf8');
 
-    if (failedTests.length > 0) {
+    // Retrieve the parent suite and tests in the results from test-results/last-run
+    const parentAndTest = JSON.parse(failedTests).map(({ parent, test }) => ({
+      parent,
+      test,
+    }));
+    // Combine parent suite and test together
+    const resultSet = new Set(
+      Object.values(parentAndTest).flatMap(
+        (parent) => parent.parent + ',' + parent.test + ';'
+      )
+    );
+    // Format string for use in grep functionality
+    const stringedTests = Array.from(resultSet)
+      .toString()
+      .replaceAll(',', ' ')
+      .slice(0, -1);
+
+    if (stringedTests.length > 0) {
       // Allow for additional cli arguments to be passed to the run command
       const runOptions = await cypress.cli.parseRunArguments(
         process.argv.slice(2)
       );
 
       // Set cypress environment variables needed for running last failed tests
-      process.env.CYPRESS_grep = `${failedTests}`;
+      process.env.CYPRESS_grep = `${stringedTests}`;
       process.env.CYPRESS_grepFilterSpecs = true;
       process.env.CYPRESS_grepOmitFiltered = true;
 

package/src/index.js

@@ -21,18 +21,23 @@ const collectFailingTests = (on, config) => {
     for (i in results.runs) {
       const tests = results.runs[i].tests
         .filter((test) => test.state === 'failed')
-        .map((test) => test.title[test.title.length - 1]);
+        .map((test) => test.title);
 
-      // Only store non empty test titles
-      if (tests != '') {
-        failedTests.push(tests);
+      const spec = results.runs[i].spec.relative;
+
+      for (i in tests) {
+        let report = {
+          spec: spec,
+          parent: [...tests[i].slice(0, -1)],
+          test: tests[i].pop(),
+        };
+        // Only store non empty test titles
+        if (tests != '') {
+          failedTests.push(report);
+        }
       }
     }
 
-    const stringedTests = failedTests.toString();
-    // Prepare a string that can be read from cy-grep
-    const greppedTestFormat = stringedTests.replaceAll(',', '; ');
-
     // Use the cypress.config directory for path for storing test-results
     const failedTestFileDirectory = `${path.dirname(
       config.configFile
@@ -44,9 +49,9 @@ const collectFailingTests = (on, config) => {
     });
     const lastRunReportFile = path.join(
       `${failedTestFileDirectory}`,
-      'last-run.txt'
+      'last-run.json'
     );
-    await fs.promises.writeFile(lastRunReportFile, greppedTestFormat);
+    await fs.promises.writeFile(lastRunReportFile, JSON.stringify(failedTests));
   });
 
   return collectFailingTests;