log -> resolve/reject while build creation

browserstack · May 7, 2020 · 4d37104 · 4d37104
1 parent 3f61f91
commit 4d37104
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 23 deletions.
diff --git a/bin/commands/runs.js b/bin/commands/runs.js
@@ -41,12 +41,14 @@ function runCypress(args) {
         zipUploader.zipUpload(bsConfig, config.fileName).then(function (zip) {
 
           // Create build
-          build.createBuild(bsConfig, zip).then(function (data) {
+          build.createBuild(bsConfig, zip).then(function (message) {
+            logger.info(message);
+            util.sendUsageReport(bsConfig, args, message, Constants.messageTypes.SUCCESS, null);
             return;
           }).catch(function (err) {
             // Build creation failed
-            logger.error(Constants.userMessages.BUILD_FAILED)
-            util.sendUsageReport(bsConfig, args, Constants.userMessages.BUILD_FAILED, Constants.messageTypes.ERROR, 'build_failed');
+            logger.error(err);
+            util.sendUsageReport(bsConfig, args, err, Constants.messageTypes.ERROR, 'build_failed');
           });
         }).catch(function (err) {
           // Zip Upload failed

diff --git a/bin/helpers/archiver.js b/bin/helpers/archiver.js
@@ -16,14 +16,14 @@ const archiveSpecs = (runSettings, filePath) => {
 
     archive.on('warning', function (err) {
       if (err.code === 'ENOENT') {
-        logger.info(err)
+        logger.info(err);
       } else {
-        reject(err)
+        reject(err);
       }
     });
 
     output.on('close', function () {
-      resolve("Zipping completed")
+      resolve("Zipping completed");
     });
 
     output.on('end', function () {

diff --git a/bin/helpers/build.js b/bin/helpers/build.js
@@ -1,8 +1,7 @@
 'use strict';
 const request = require('request');
 
-const logger = require("./logger").winstonLogger,
-  config = require('./config'),
+const config = require('./config'),
   capabilityHelper = require("../helpers/capabilityHelper"),
   Constants = require('../helpers/constants');
 
@@ -23,34 +22,29 @@ const createBuild = (bsConfig, zip) => {
 
       request.post(options, function (err, resp, body) {
         if (err) {
-          reject(err)
+          reject(err);
         } else {
-          let build = null
+          let build = null;
           try {
-            build = JSON.parse(body)
+            build = JSON.parse(body);
           } catch (error) {
-            build = null
+            build = null;
           }
 
           if (resp.statusCode == 299) {
             if (build) {
-              logger.info(build.message);
+              resolve(build.message);
             } else {
-              logger.info(Constants.userMessages.API_DEPRECATED);
+              reject(Constants.userMessages.API_DEPRECATED);
             }
           } else if (resp.statusCode != 201) {
             if (build) {
-              logger.error(
-                `${Constants.userMessages.BUILD_FAILED} Error: ${build.message}`
-              );
+              reject(`${Constants.userMessages.BUILD_FAILED} Error: ${build.message}`);
             } else {
-              logger.error(Constants.userMessages.BUILD_FAILED);
+              reject(Constants.userMessages.BUILD_FAILED);
             }
           } else {
-            logger.info(build.message);
-            logger.info(
-              `${Constants.userMessages.BUILD_CREATED} with build id: ${build.build_id}`
-            );
+            resolve(`${build.message}! ${Constants.userMessages.BUILD_CREATED} with build id: ${build.build_id}`);
           }
           resolve(build);
         }

diff --git a/bin/helpers/constants.js b/bin/helpers/constants.js
@@ -8,7 +8,7 @@ const userMessages = {
     CONFIG_FILE_CREATED: "BrowserStack Config File created, you can now run browserstack-cypress --config-file run",
     CONFIG_FILE_EXISTS: "File already exists, delete the browserstack.json file manually. skipping...",
     ZIP_DELETE_FAILED: "Could not delete local file.",
-    ZIP_DELETED: "File deleted successfully.",
+    ZIP_DELETED: "Zip file deleted successfully.",
     API_DEPRECATED: "This version of API is deprecated, please use latest version of API.",
     FAILED_TO_ZIP: "Failed to zip files."
 };