Merge pull request #46 from asambstack/master

Update separator check to accomodate builds without separator in names

Author: rahuln-bs

pom.xml

@@ -10,7 +10,7 @@
   </parent>
 
   <artifactId>browserstack-integration</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.4-SNAPSHOT</version>
   <packaging>hpi</packaging>
 
   <name>BrowserStack</name>

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

@@ -52,7 +52,7 @@ public JSONObject getCypressMatrix(String filepath) {
             String jsonTxt = IOUtils.toString(is, "UTF-8");
             report = new JSONObject(jsonTxt);
         } catch (FileNotFoundException e) {
-            logError(logger, "No BrowserStackBuildAction found");
+            logError(logger, "Cypress report not found at " + reportJSONPath);
             tracker.sendError("BrowserStack Cypress Report Not Found", pipelineStatus, "CypressReportGeneration");
         } catch (IOException e) {
             logError(logger, "There was a problem while reading report files");
@@ -70,7 +70,9 @@ public boolean generateBrowserStackCypressReport(String workspace) {
             }
 
             String buildNameWithBuildNumber = matrix.optString("build_name");
-            String buildNameWithoutBuildNumber = buildNameWithBuildNumber.substring(0, buildNameWithBuildNumber.lastIndexOf(": "));
+            int indexOfBuildNumberSeparator = buildNameWithBuildNumber.lastIndexOf(": ") == -1 ? buildNameWithBuildNumber.length()
+                    : buildNameWithBuildNumber.lastIndexOf(": ");
+            String buildNameWithoutBuildNumber = buildNameWithBuildNumber.substring(0, indexOfBuildNumberSeparator);
 
             if (buildNameWithoutBuildNumber == null) {
                 logError(logger, "BrowserStack Cypress Report not generated, result json may have been corrupted. Please retry.");

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

@@ -47,7 +47,7 @@ public void perform(@Nonnull Run<?, ?> build, @Nonnull FilePath workspace, @Nonn
         final EnvVars parentEnvs = build.getEnvironment(listener);
         String browserStackBuildName = parentEnvs.get(BrowserStackEnvVars.BROWSERSTACK_BUILD_NAME);
         browserStackBuildName = Optional.ofNullable(browserStackBuildName).orElse(parentEnvs.get(Constants.JENKINS_BUILD_TAG));
-        final String jenkinsFolder = parentEnvs.get("WORKSPACE");
+        final String jenkinsFolder = parentEnvs.get("BROWSERSTACK_CYPRESS_PROJECT_ROOT") != null ? parentEnvs.get("BROWSERSTACK_CYPRESS_PROJECT_ROOT") : parentEnvs.get("WORKSPACE");
         ProjectType product = ProjectType.AUTOMATE;
 
         tracker.reportGenerationInitialized(browserStackBuildName, product.name(), pipelineStatus);