Add description, fix tracker and handle null or empty strings

Author: SagarGaniga

src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackCypressReportForBuild.java

@@ -53,10 +53,10 @@ public JSONObject getCypressMatrix(String filepath) {
             report = new JSONObject(jsonTxt);
         } catch (FileNotFoundException e) {
             logError(logger, "No BrowserStackBuildAction found");
-            tracker.sendError("BrowserStack Cypress Report Not Found", pipelineStatus, "ReportGeneration");
+            tracker.sendError("BrowserStack Cypress Report Not Found", pipelineStatus, "CypressReportGeneration");
         } catch (IOException e) {
             logError(logger, "There was a problem while reading report files");
-            tracker.sendError(e.toString(), pipelineStatus, "ReportGeneration");
+            tracker.sendError(e.toString(), pipelineStatus, "CypressReportGeneration");
         }
         return report;
     }
@@ -69,12 +69,18 @@ public boolean generateBrowserStackCypressReport(String workspace) {
                 return false;
             }
 
-            String buildNameWithBuildNumber = matrix.getString("build_name");
+            String buildNameWithBuildNumber = matrix.optString("build_name");
             String buildNameWithoutBuildNumber = buildNameWithBuildNumber.substring(0, buildNameWithBuildNumber.lastIndexOf(": "));
 
+            if (buildNameWithoutBuildNumber == null) {
+                logError(logger, "BrowserStack Cypress Report not generated, result json may have been corrupted. Please retry.");
+                tracker.sendError("Report not generated", pipelineStatus, "CypressReportGeneration");
+                return false;
+            }
+
             if (!buildNameWithoutBuildNumber.equalsIgnoreCase(this.buildName)) {
                 logError(logger, "BrowserStack Cypress Report not generated, build name mismatch.");
-                tracker.sendError("Report not generated", pipelineStatus, "ReportGeneration");
+                tracker.sendError("Report not generated", pipelineStatus, "CypressReportGeneration");
                 return false;
             }
 

src/main/java/com/browserstack/automate/ci/jenkins/BrowserStackCypressReportPublisher.java

@@ -46,13 +46,9 @@ public void perform(@Nonnull Run<?, ?> build, @Nonnull FilePath workspace, @Nonn
 
         final EnvVars parentEnvs = build.getEnvironment(listener);
         String browserStackBuildName = parentEnvs.get(BrowserStackEnvVars.BROWSERSTACK_BUILD_NAME);
-        final String browserStackAppID = parentEnvs.get(BrowserStackEnvVars.BROWSERSTACK_APP_ID);
         browserStackBuildName = Optional.ofNullable(browserStackBuildName).orElse(parentEnvs.get(Constants.JENKINS_BUILD_TAG));
         final String jenkinsFolder = parentEnvs.get("WORKSPACE");
         ProjectType product = ProjectType.AUTOMATE;
-        if (browserStackAppID != null && !browserStackAppID.isEmpty()) {
-            product = ProjectType.APP_AUTOMATE;
-        }
 
         tracker.reportGenerationInitialized(browserStackBuildName, product.name(), pipelineStatus);
         log(logger, "BrowserStack Cypress Project identified as : " + product.name());

src/main/resources/com/browserstack/automate/ci/jenkins/AbstractBrowserStackCypressReportForBuild/index.jelly

@@ -166,9 +166,16 @@
                                 <span class='spec-path'>
                                     ${specs.path}
                                 </span>
-                                <span class='spec-stats spec-stats-failed'>
-                                    ${specs.failed}/${specs.total} FAILED
-                                </span>
+                                <j:if test="${(specs.failed > 0)}">
+                                    <span class='spec-stats spec-stats-failed'>
+                                        ${specs.failed}/${specs.total} FAILED
+                                    </span>
+                                </j:if>
+                                <j:if test="${(specs.failed == 0)}">
+                                    <span class='spec-stats spec-stats-passed'>
+                                        ${specs.passed}/${specs.total} PASSED
+                                    </span>
+                                </j:if>
                             </div>
 
                             <div class='spec-sessions'>

src/main/resources/com/browserstack/automate/ci/jenkins/BrowserStackCypressReportPublisher/config.jelly

@@ -0,0 +1,4 @@
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
+    This step will generate BrowserStack Cypress Test Report by utilising the build name from the environment variable BROWSERSTACK_BUILD_NAME set by the BrowserStack plugin
+</j:jelly>