Adding support for < v6 cypress_version

Author: karanshah-browserstack

bin/helpers/reporterHTML.js

@@ -223,24 +223,39 @@ async function cypressReportData(report_data) {
     let specSessions = report_data.rows[spec]["sessions"];
     if (specSessions.length > 0) {
       for (let combination of specSessions) {
-        combinationPromises.push(generateCypressCombinationSpecReportData(combination));
+        if(utils.isUndefined(report_data.cypress_version) || report_data.cypress_version < "6"){
+          combinationPromises.push(generateCypressCombinationSpecReportDataWithoutConfigJson(combination));
+        }else{
+          combinationPromises.push(generateCypressCombinationSpecReportDataWithConfigJson(combination));
+        }
       }
     }
   }
   await Promise.all(combinationPromises);
   return report_data;
 }
 
-function generateCypressCombinationSpecReportData(combination){
+function generateCypressCombinationSpecReportDataWithConfigJson(combination){
   return new Promise(async (resolve, reject) => {
       try {
+        let configJsonError, resultsJsonError;
         let [configJsonResponse, resultsJsonResponse] = await axios.all([
-            axios.get(combination.tests.config_json),
-            axios.get(combination.tests.result_json)
+            axios.get(combination.tests.config_json).catch(function (error) {
+              configJsonError = true;
+            }),
+            axios.get(combination.tests.result_json).catch(function(error){
+              resultsJsonError = true;
+            })
           ]);
+        if(resultsJsonError || configJsonError){
+          resolve();
+        }
         let tests = {};
         let configJson = configJsonResponse.data;
         let resultsJson = resultsJsonResponse.data;
+        if(utils.isUndefined(configJson.tests) || utils.isUndefined(resultsJson.tests)){
+          resolve();
+        }
         configJson.tests.forEach((test) => {
           tests[test["clientId"]] = test;
         });
@@ -266,4 +281,34 @@ function generateCypressCombinationSpecReportData(combination){
   })
 }
 
+function generateCypressCombinationSpecReportDataWithoutConfigJson(combination){
+  return new Promise(async (resolve, reject) => {
+      try {
+        let resultsJsonError;
+        let resultsJsonResponse = await axios.get(combination.tests.result_json).catch(function(error){
+              resultsJsonError = true;
+            });
+        if(resultsJsonError || utils.isUndefined(resultsJsonResponse)){
+          resolve();
+        }
+        let resultsJson = resultsJsonResponse.data;
+        let sessionTests = [];
+        if(utils.isUndefined(resultsJson.tests)){
+          resolve();
+        }
+        resultsJson.tests.forEach((test) => {
+          sessionTests.push({
+            name: test["title"].pop(),
+            status: test["state"],
+            duration: parseFloat(
+              test["attempts"].pop()["wallClockDuration"] / 1000
+            ).toFixed(2)
+          })
+        });
+        combination.tests = sessionTests;
+        resolve(combination.tests);
+      } catch (error) { reject(error) }
+  })
+}
+
 exports.reportGenerator = reportGenerator;

test/unit/bin/helpers/reporterHTML.js

@@ -276,7 +276,8 @@ describe("reportHTML", () => {
   describe("Modify Cypress Report Data", ()=> {
     const reporterHTML = rewire('../../../../bin/helpers/reporterHTML');
     const cypressReportData = reporterHTML.__get__('cypressReportData');
-    const cypress_report_data = {
+    const cypress_report_data_with_config = {
+      cypress_version: "6.8.0",
       rows: {
         "todo.spec.js": {
           "sessions": [
@@ -290,7 +291,22 @@ describe("reportHTML", () => {
         }
       }
     }
-    it("Generate Report Data for each combination in a separate promise ", async ()=>{
+    const cypress_report_data_without_config = {
+      cypress_version: "5.6.0",
+      rows: {
+        "todo.spec.js": {
+          "sessions": [
+              {
+                "tests": {
+                    "config_json": "config_json",
+                    "result_json": "result_json",
+                  }
+              }
+          ]
+        }
+      }
+    }
+    it("Generate Report Data for cypress version > 6", async ()=>{
       let configResponse = { data: {
         tests: [
           {
@@ -317,6 +333,7 @@ describe("reportHTML", () => {
         ]
       } }
       let expectedResponse = { 
+        cypress_version: "6.8.0",
         rows:{ 
           "todo.spec.js": {
             "sessions":[{
@@ -331,10 +348,49 @@ describe("reportHTML", () => {
       let axiosGetStub = sandbox.stub(axios, "get")
       let axiosConfigStub = axiosGetStub.withArgs("config_json").resolves(configResponse);
       let axiosResultStub = axiosGetStub.withArgs("result_json").resolves(resultsResponse);
-      let result = await cypressReportData(cypress_report_data);
+      let result = await cypressReportData(cypress_report_data_with_config);
       sinon.assert.calledOnce(axiosConfigStub);
       sinon.assert.calledOnce(axiosResultStub);
       expect(JSON.stringify(result)).to.be.equal(JSON.stringify(expectedResponse));
     });
+
+    it("Generate Report Data for cypress version < 6", async ()=>{
+      let resultsResponse = { data: {
+        tests: [
+          {
+            clientId: "r3",
+            state: "passed",
+            title:[
+              "file_name",
+              "test_case"
+            ],
+            attempts:[
+              {
+                "state": "passed",
+                "wallClockDuration": 62
+              }
+            ]
+          }
+        ]
+      } }
+      let expectedResponse = { 
+        cypress_version: "5.6.0",
+        rows:{ 
+          "todo.spec.js": {
+            "sessions":[{
+              "tests":[{
+                "name":"test_case",
+                "status":"passed",
+                "duration":"0.06"}]
+              }]
+            }
+          }
+        }
+      let axiosGetStub = sandbox.stub(axios, "get")
+      let axiosResultStub = axiosGetStub.withArgs("result_json").resolves(resultsResponse);
+      let result = await cypressReportData(cypress_report_data_without_config);
+      sinon.assert.calledOnce(axiosResultStub);
+      expect(JSON.stringify(result)).to.be.equal(JSON.stringify(expectedResponse));
+    });
   });
 });