Skip to content

Commit 4d37104

Browse files
committed
log -> resolve/reject while build creation
1 parent 3f61f91 commit 4d37104

File tree

4 files changed

+19
-23
lines changed

4 files changed

+19
-23
lines changed

bin/commands/runs.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ function runCypress(args) {
4141
zipUploader.zipUpload(bsConfig, config.fileName).then(function (zip) {
4242

4343
// Create build
44-
build.createBuild(bsConfig, zip).then(function (data) {
44+
build.createBuild(bsConfig, zip).then(function (message) {
45+
logger.info(message);
46+
util.sendUsageReport(bsConfig, args, message, Constants.messageTypes.SUCCESS, null);
4547
return;
4648
}).catch(function (err) {
4749
// Build creation failed
48-
logger.error(Constants.userMessages.BUILD_FAILED)
49-
util.sendUsageReport(bsConfig, args, Constants.userMessages.BUILD_FAILED, Constants.messageTypes.ERROR, 'build_failed');
50+
logger.error(err);
51+
util.sendUsageReport(bsConfig, args, err, Constants.messageTypes.ERROR, 'build_failed');
5052
});
5153
}).catch(function (err) {
5254
// Zip Upload failed

bin/helpers/archiver.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ const archiveSpecs = (runSettings, filePath) => {
1616

1717
archive.on('warning', function (err) {
1818
if (err.code === 'ENOENT') {
19-
logger.info(err)
19+
logger.info(err);
2020
} else {
21-
reject(err)
21+
reject(err);
2222
}
2323
});
2424

2525
output.on('close', function () {
26-
resolve("Zipping completed")
26+
resolve("Zipping completed");
2727
});
2828

2929
output.on('end', function () {

bin/helpers/build.js

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
'use strict';
22
const request = require('request');
33

4-
const logger = require("./logger").winstonLogger,
5-
config = require('./config'),
4+
const config = require('./config'),
65
capabilityHelper = require("../helpers/capabilityHelper"),
76
Constants = require('../helpers/constants');
87

@@ -23,34 +22,29 @@ const createBuild = (bsConfig, zip) => {
2322

2423
request.post(options, function (err, resp, body) {
2524
if (err) {
26-
reject(err)
25+
reject(err);
2726
} else {
28-
let build = null
27+
let build = null;
2928
try {
30-
build = JSON.parse(body)
29+
build = JSON.parse(body);
3130
} catch (error) {
32-
build = null
31+
build = null;
3332
}
3433

3534
if (resp.statusCode == 299) {
3635
if (build) {
37-
logger.info(build.message);
36+
resolve(build.message);
3837
} else {
39-
logger.info(Constants.userMessages.API_DEPRECATED);
38+
reject(Constants.userMessages.API_DEPRECATED);
4039
}
4140
} else if (resp.statusCode != 201) {
4241
if (build) {
43-
logger.error(
44-
`${Constants.userMessages.BUILD_FAILED} Error: ${build.message}`
45-
);
42+
reject(`${Constants.userMessages.BUILD_FAILED} Error: ${build.message}`);
4643
} else {
47-
logger.error(Constants.userMessages.BUILD_FAILED);
44+
reject(Constants.userMessages.BUILD_FAILED);
4845
}
4946
} else {
50-
logger.info(build.message);
51-
logger.info(
52-
`${Constants.userMessages.BUILD_CREATED} with build id: ${build.build_id}`
53-
);
47+
resolve(`${build.message}! ${Constants.userMessages.BUILD_CREATED} with build id: ${build.build_id}`);
5448
}
5549
resolve(build);
5650
}

bin/helpers/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const userMessages = {
88
CONFIG_FILE_CREATED: "BrowserStack Config File created, you can now run browserstack-cypress --config-file run",
99
CONFIG_FILE_EXISTS: "File already exists, delete the browserstack.json file manually. skipping...",
1010
ZIP_DELETE_FAILED: "Could not delete local file.",
11-
ZIP_DELETED: "File deleted successfully.",
11+
ZIP_DELETED: "Zip file deleted successfully.",
1212
API_DEPRECATED: "This version of API is deprecated, please use latest version of API.",
1313
FAILED_TO_ZIP: "Failed to zip files."
1414
};

0 commit comments

Comments
 (0)