Fixing the report generation code

Author: suryart

bin/commands/runs.js

@@ -9,7 +9,7 @@ const archiver = require("../helpers/archiver"),
   utils = require("../helpers/utils"),
   fileHelpers = require("../helpers/fileHelpers"),
   syncRunner = require("../helpers/syncRunner"),
-  reporterHTML = require('../helpers/reporterHTML');
+  reportGenerator = require('../helpers/reporterHTML').reportGenerator;
 
 module.exports = function run(args) {
   let bsConfigPath = utils.getConfigPath(args.cf);
@@ -71,10 +71,11 @@ module.exports = function run(args) {
             }
             if (args.sync) {
               syncRunner.pollBuildStatus(bsConfig, data).then((exitCode) => {
-                utils.sendUsageReport(bsConfig, args, `${message}\n${dashboardLink}`, Constants.messageTypes.SUCCESS, null);
                 // Generate custom report!
-                reporterHTML.reportGenerator(bsConfig, data.build_id, args);
-                utils.handleSyncExit(exitCode, data.dashboard_url)
+                reportGenerator(bsConfig, data.build_id, args, function(){
+                  utils.sendUsageReport(bsConfig, args, `${message}\n${dashboardLink}`, Constants.messageTypes.SUCCESS, null);
+                  utils.handleSyncExit(exitCode, data.dashboard_url);
+                });
               });
             }
 

bin/helpers/reporterHTML.js

@@ -88,7 +88,7 @@ function buildSpecStats(specMeta) {
   return specStats;
 }
 
-let reportGenerator = (bsConfig, buildId, args) => {
+let reportGenerator = (bsConfig, buildId, args, cb) => {
   let options = {
     url: `${config.buildUrl}${buildId}/custom_report`,
     auth: {
@@ -100,7 +100,7 @@ let reportGenerator = (bsConfig, buildId, args) => {
     },
   };
 
-  request.get(options, function (err, resp, body) {
+  return request.get(options, function (err, resp, body) {
     let message = null;
     let messageType = null;
     let errorCode = null;
@@ -152,8 +152,10 @@ let reportGenerator = (bsConfig, buildId, args) => {
       logger.info(message);
     }
     utils.sendUsageReport(bsConfig, args, message, messageType, errorCode);
+    if (cb){
+      cb();
+    }
   });
-
 }
 
 function renderReportHTML(report_data) {