Skip to content

Commit a3bb89f

Browse files
roshan04roshan04
committed
resolved specs
1 parent 4fe76cd commit a3bb89f

File tree

11 files changed

+63
-47
lines changed

11 files changed

+63
-47
lines changed

‎bin/commands/generateDownloads.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
const logger = require("../helpers/logger").winstonLogger,
44
Constants = require("../helpers/constants"),
55
utils = require("../helpers/utils"),
6-
downloadBuildArtifacts = require('../helpers/buildArtifacts').downloadBuildArtifacts;
6+
downloadBuildArtifacts = require('../helpers/buildArtifacts').downloadBuildArtifacts,
7+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails;
78

89

910
module.exports = async function generateDownloads(args, rawArgs) {
@@ -19,7 +20,7 @@ module.exports = async function generateDownloads(args, rawArgs) {
1920
// accept the access key from command line if provided
2021
utils.setAccessKey(bsConfig, args);
2122

22-
let buildReportData = await utils.getInitialDetails(bsConfig, args, rawArgs);
23+
let buildReportData = await getInitialDetails(bsConfig, args, rawArgs);
2324

2425
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
2526

‎bin/commands/generateReport.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
const logger = require("../helpers/logger").winstonLogger,
44
Constants = require("../helpers/constants"),
55
utils = require("../helpers/utils"),
6-
reporterHTML = require('../helpers/reporterHTML');
6+
reporterHTML = require('../helpers/reporterHTML'),
7+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails;
78

89

910
module.exports = function generateReport(args, rawArgs) {
@@ -20,7 +21,7 @@ module.exports = function generateReport(args, rawArgs) {
2021
// accept the access key from command line if provided
2122
utils.setAccessKey(bsConfig, args);
2223

23-
utils.getInitialDetails(bsConfig, args, rawArgs).then((buildReportData) => {
24+
getInitialDetails(bsConfig, args, rawArgs).then((buildReportData) => {
2425

2526
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
2627

‎bin/commands/info.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const request = require('request');
44
const config = require("../helpers/config"),
55
logger = require("../helpers/logger").winstonLogger,
66
Constants = require("../helpers/constants"),
7-
utils = require("../helpers/utils");
7+
utils = require("../helpers/utils"),
8+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails;
89

910
module.exports = function info(args, rawArgs) {
1011
let bsConfigPath = utils.getConfigPath(args.cf);
@@ -18,7 +19,7 @@ module.exports = function info(args, rawArgs) {
1819
// accept the access key from command line if provided
1920
utils.setAccessKey(bsConfig, args);
2021

21-
utils.getInitialDetails(bsConfig, args, rawArgs).then((buildReportData) => {
22+
getInitialDetails(bsConfig, args, rawArgs).then((buildReportData) => {
2223

2324
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
2425

‎bin/commands/runs.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const archiver = require("../helpers/archiver"),
1010
Constants = require("../helpers/constants"),
1111
utils = require("../helpers/utils"),
1212
fileHelpers = require("../helpers/fileHelpers"),
13+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails,
1314
syncRunner = require("../helpers/syncRunner"),
1415
checkUploaded = require("../helpers/checkUploaded"),
1516
packageInstaller = require("../helpers/packageInstaller"),
@@ -44,7 +45,9 @@ module.exports = function run(args, rawArgs) {
4445
// accept the access key from command line or env variable if provided
4546
utils.setAccessKey(bsConfig, args);
4647

47-
let buildReportData = await utils.getInitialDetails(bsConfig, args, rawArgs);
48+
console.log(`roshan1: the constant before runs is ${Constants.STATE_CHANGING_HASH.initial_details} ::`)
49+
let buildReportData = await getInitialDetails(bsConfig, args, rawArgs);
50+
console.log(`roshan1: the constant after runs is ${Constants.STATE_CHANGING_HASH.initial_details} ::`)
4851

4952
// accept the build name from command line if provided
5053
utils.setBuildName(bsConfig, args);

‎bin/commands/stop.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ const request = require('request');
44
const config = require("../helpers/config"),
55
logger = require("../helpers/logger").winstonLogger,
66
Constants = require("../helpers/constants"),
7-
utils = require("../helpers/utils");
7+
utils = require("../helpers/utils"),
8+
getInitialDetails = require('../helpers/getInitialDetails').getInitialDetails;
89

910
module.exports = function stop(args, rawArgs) {
1011
let bsConfigPath = utils.getConfigPath(args.cf);
@@ -18,7 +19,7 @@ module.exports = function stop(args, rawArgs) {
1819
// accept the access key from command line if provided
1920
utils.setAccessKey(bsConfig, args);
2021

21-
let buildReportData = await utils.getInitialDetails(bsConfig, args, rawArgs);
22+
let buildReportData = await getInitialDetails(bsConfig, args, rawArgs);
2223

2324
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
2425

‎bin/helpers/constants.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ const RAW_ARGS_REGEX = /(?<=("-u"|"-username"|"-k"|"-key") *, *)"[^,\]]*/g
237237

238238
const ERROR_EXIT_CODE = 1;
239239

240-
const INITIAL_DETAILS = {};
241240

242241
const BUILD_FAILED_EXIT_CODE = 3;
243242

@@ -262,7 +261,6 @@ module.exports = Object.freeze({
262261
DEFAULT_CYPRESS_SPEC_PATH,
263262
SPEC_TOTAL_CHAR_LIMIT,
264263
METADATA_CHAR_BUFFER_PER_SPEC,
265-
INITIAL_DETAILS,
266264
usageReportingConstants,
267265
LATEST_VERSION_SYNTAX_REGEX,
268266
ERROR_EXIT_CODE,

‎bin/helpers/getInitialDetails.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const request = require('request'),
44
config = require("./config"),
55
Constants = require('./constants');
66

7-
exports.getInitialDetailsFromAPI = (bsConfig, args, rawArgs) => {
7+
exports.getInitialDetails = (bsConfig, args, rawArgs) => {
88
return new Promise((resolve, reject) => {
99
let options = {
1010
url: config.getInitialDetails,

‎bin/helpers/utils.js‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const usageReporting = require("./usageReporting"),
1414
Constants = require("./constants"),
1515
chalk = require('chalk'),
1616
syncCliLogger = require("../helpers/logger").syncCliLogger,
17-
getInitialDetailsFromAPI = require("../helpers/getInitialDetails").getInitialDetailsFromAPI,
1817
fileHelpers = require("./fileHelpers"),
1918
config = require("../helpers/config"),
2019
pkg = require('../../package.json');
@@ -161,20 +160,6 @@ exports.getParallels = (bsConfig, args) => {
161160
return args.parallels || bsConfig['run_settings']['parallels'];
162161
}
163162

164-
exports.getInitialDetails = (bsConfig, args, rawArgs) => {
165-
let initObj = null;
166-
return new Promise(async (reject, resolve) => {
167-
if(Object.keys(Constants.INITIAL_DETAILS).length > 0) {
168-
initObj = Constants.INITIAL_DETAILS;
169-
resolve(initObj);
170-
} else {
171-
initObj = await getInitialDetailsFromAPI(bsConfig, args, rawArgs);
172-
Constants.INITIAL_DETAILS = initObj;
173-
resolve(initObj);
174-
}
175-
});
176-
}
177-
178163
exports.setParallels = (bsConfig, args, numOfSpecs) => {
179164
if (!this.isUndefined(args.parallels)) {
180165
bsConfig["run_settings"]["parallels"] = args.parallels;
@@ -1114,7 +1099,7 @@ exports.setProcessHooks = (buildId, bsConfig, bsLocal, args, buildReportData) =>
11141099
async function processExitHandler(exitData){
11151100
logger.warn(Constants.userMessages.PROCESS_KILL_MESSAGE);
11161101
await this.stopBrowserStackBuild(exitData.bsConfig, exitData.args, exitData.buildId, null, exitData.buildReportData);
1117-
await this.stopLocalBinary(exitData.bsConfig, exitData.bsLocalInstance, exitData.args);
1102+
await this.stopLocalBinary(exitData.bsConfig, exitData.bsLocalInstance, exitData.args, null, exitData.buildReportData);
11181103
process.exit(0);
11191104
}
11201105

‎test/unit/bin/commands/info.js‎

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ describe("buildInfo", () => {
5555
'../helpers/utils': {
5656
setUsername: setUsernameStub,
5757
setAccessKey: setAccessKeyStub,
58-
getInitialDetails: getInitialDetailsStub,
5958
validateBstackJson: validateBstackJsonStub,
6059
getErrorCodeFromErr: getErrorCodeFromErrStub,
6160
sendUsageReport: sendUsageReportStub,
@@ -66,6 +65,9 @@ describe("buildInfo", () => {
6665
setDefaults: setDefaultsStub,
6766
formatRequest,
6867
},
68+
'../helpers/getInitialDetails': {
69+
getInitialDetails: getInitialDetailsStub,
70+
},
6971
request: {get: requestStub},
7072
});
7173

@@ -97,7 +99,6 @@ describe("buildInfo", () => {
9799
'../helpers/utils': {
98100
setUsername: setUsernameStub,
99101
setAccessKey: setAccessKeyStub,
100-
getInitialDetails: getInitialDetailsStub,
101102
validateBstackJson: validateBstackJsonStub,
102103
getErrorCodeFromErr: getErrorCodeFromErrStub,
103104
sendUsageReport: sendUsageReportStub,
@@ -108,6 +109,9 @@ describe("buildInfo", () => {
108109
setDefaults: setDefaultsStub,
109110
formatRequest,
110111
},
112+
'../helpers/getInitialDetails': {
113+
getInitialDetails: getInitialDetailsStub,
114+
},
111115
request: {get: requestStub},
112116
});
113117

@@ -164,7 +168,6 @@ describe("buildInfo", () => {
164168
'../helpers/utils': {
165169
setUsername: setUsernameStub,
166170
setAccessKey: setAccessKeyStub,
167-
getInitialDetails: getInitialDetailsStub,
168171
validateBstackJson: validateBstackJsonStub,
169172
getErrorCodeFromErr: getErrorCodeFromErrStub,
170173
sendUsageReport: sendUsageReportStub,
@@ -175,6 +178,9 @@ describe("buildInfo", () => {
175178
setDefaults: setDefaultsStub,
176179
formatRequest,
177180
},
181+
'../helpers/getInitialDetails': {
182+
getInitialDetails: getInitialDetailsStub,
183+
},
178184
request: {get: requestStub},
179185
});
180186

@@ -212,7 +218,6 @@ describe("buildInfo", () => {
212218
'../helpers/utils': {
213219
setUsername: setUsernameStub,
214220
setAccessKey: setAccessKeyStub,
215-
getInitialDetails: getInitialDetailsStub,
216221
validateBstackJson: validateBstackJsonStub,
217222
getErrorCodeFromErr: getErrorCodeFromErrStub,
218223
sendUsageReport: sendUsageReportStub,
@@ -223,6 +228,9 @@ describe("buildInfo", () => {
223228
setDefaults: setDefaultsStub,
224229
formatRequest,
225230
},
231+
'../helpers/getInitialDetails': {
232+
getInitialDetails: getInitialDetailsStub,
233+
},
226234
request: {get: requestStub},
227235
});
228236

@@ -254,7 +262,6 @@ describe("buildInfo", () => {
254262
'../helpers/utils': {
255263
setUsername: setUsernameStub,
256264
setAccessKey: setAccessKeyStub,
257-
getInitialDetails: getInitialDetailsStub,
258265
validateBstackJson: validateBstackJsonStub,
259266
getErrorCodeFromErr: getErrorCodeFromErrStub,
260267
sendUsageReport: sendUsageReportStub,
@@ -265,6 +272,9 @@ describe("buildInfo", () => {
265272
setDefaults: setDefaultsStub,
266273
formatRequest,
267274
},
275+
'../helpers/getInitialDetails': {
276+
getInitialDetails: getInitialDetailsStub,
277+
},
268278
request: {get: requestStub},
269279
});
270280

@@ -321,7 +331,6 @@ describe("buildInfo", () => {
321331
'../helpers/utils': {
322332
setUsername: setUsernameStub,
323333
setAccessKey: setAccessKeyStub,
324-
getInitialDetails: getInitialDetailsStub,
325334
validateBstackJson: validateBstackJsonStub,
326335
getErrorCodeFromErr: getErrorCodeFromErrStub,
327336
sendUsageReport: sendUsageReportStub,
@@ -331,6 +340,9 @@ describe("buildInfo", () => {
331340
getConfigPath: getConfigPathStub,
332341
setDefaults: setDefaultsStub
333342
},
343+
'../helpers/getInitialDetails': {
344+
getInitialDetails: getInitialDetailsStub,
345+
},
334346
request: {get: requestStub},
335347
});
336348

@@ -378,8 +390,7 @@ describe("buildInfo", () => {
378390
const info = proxyquire('../../../../bin/commands/info', {
379391
'../helpers/utils': {
380392
setUsername: setUsernameStub,
381-
setAccessKey: setAccessKeyStub,
382-
getInitialDetails: getInitialDetailsStub,
393+
setAccessKey: setAccessKeyStub,
383394
validateBstackJson: validateBstackJsonStub,
384395
getErrorCodeFromErr: getErrorCodeFromErrStub,
385396
sendUsageReport: sendUsageReportStub,
@@ -388,6 +399,9 @@ describe("buildInfo", () => {
388399
getConfigPath: getConfigPathStub,
389400
setDefaults: setDefaultsStub
390401
},
402+
'../helpers/getInitialDetails': {
403+
getInitialDetails: getInitialDetailsStub,
404+
}
391405
});
392406

393407
validateBstackJsonStub.returns(Promise.reject({ message: "reject error" }));

‎test/unit/bin/commands/runs.js‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,14 @@ describe("runs", () => {
159159
setConfig: setConfigStub,
160160
setCLIMode: setCLIModeStub,
161161
setGeolocation: setGeolocationStub,
162-
setSpecTimeout: setSpecTimeoutStub,
163-
getInitialDetails: getInitialDetailsStub
162+
setSpecTimeout: setSpecTimeoutStub
164163
},
165164
'../helpers/capabilityHelper': {
166165
validate: capabilityValidatorStub
167166
},
167+
'../helpers/getInitialDetails': {
168+
getInitialDetails: getInitialDetailsStub,
169+
}
168170
});
169171

170172
validateBstackJsonStub.returns(Promise.resolve(bsConfig));
@@ -307,8 +309,7 @@ describe("runs", () => {
307309
setCLIMode: setCLIModeStub,
308310
setGeolocation: setGeolocationStub,
309311
getVideoConfig: getVideoConfigStub,
310-
setSpecTimeout: setSpecTimeoutStub,
311-
getInitialDetails: getInitialDetailsStub
312+
setSpecTimeout: setSpecTimeoutStub
312313
},
313314
'../helpers/capabilityHelper': {
314315
validate: capabilityValidatorStub,
@@ -325,6 +326,9 @@ describe("runs", () => {
325326
},
326327
'../helpers/packageInstaller': {
327328
packageWrapper: packageInstallerStub,
329+
},
330+
'../helpers/getInitialDetails': {
331+
getInitialDetails: getInitialDetailsStub,
328332
}
329333
});
330334

@@ -477,8 +481,7 @@ describe("runs", () => {
477481
fetchZipSize: fetchZipSizeStub,
478482
setGeolocation: setGeolocationStub,
479483
getVideoConfig: getVideoConfigStub,
480-
setSpecTimeout: setSpecTimeoutStub,
481-
getInitialDetails: getInitialDetailsStub
484+
setSpecTimeout: setSpecTimeoutStub
482485
},
483486
'../helpers/capabilityHelper': {
484487
validate: capabilityValidatorStub,
@@ -499,6 +502,9 @@ describe("runs", () => {
499502
'../helpers/packageInstaller': {
500503
packageWrapper: packageInstallerStub,
501504
},
505+
'../helpers/getInitialDetails': {
506+
getInitialDetails: getInitialDetailsStub,
507+
},
502508
});
503509

504510
validateBstackJsonStub.returns(Promise.resolve(bsConfig));
@@ -655,8 +661,7 @@ describe("runs", () => {
655661
fetchZipSize: fetchZipSizeStub,
656662
setGeolocation: setGeolocationStub,
657663
getVideoConfig: getVideoConfigStub,
658-
setSpecTimeout: setSpecTimeoutStub,
659-
getInitialDetails: getInitialDetailsStub
664+
setSpecTimeout: setSpecTimeoutStub
660665
},
661666
'../helpers/capabilityHelper': {
662667
validate: capabilityValidatorStub,
@@ -680,6 +685,9 @@ describe("runs", () => {
680685
'../helpers/packageInstaller': {
681686
packageWrapper: packageInstallerStub,
682687
},
688+
'../helpers/getInitialDetails': {
689+
getInitialDetails: getInitialDetailsStub,
690+
}
683691
});
684692

685693
validateBstackJsonStub.returns(Promise.resolve(bsConfig));
@@ -865,8 +873,7 @@ describe("runs", () => {
865873
fetchZipSize: fetchZipSizeStub,
866874
setGeolocation: setGeolocationStub,
867875
getVideoConfig: getVideoConfigStub,
868-
setSpecTimeout: setSpecTimeoutStub,
869-
getInitialDetails: getInitialDetailsStub
876+
setSpecTimeout: setSpecTimeoutStub
870877
},
871878
'../helpers/capabilityHelper': {
872879
validate: capabilityValidatorStub,
@@ -902,6 +909,9 @@ describe("runs", () => {
902909
getTimeComponents: getTimeComponentsStub,
903910
markBlockStart: markBlockStartStub,
904911
markBlockEnd: markBlockEndStub,
912+
},
913+
'../helpers/getInitialDetails': {
914+
getInitialDetails: getInitialDetailsStub,
905915
}
906916
});
907917

0 commit comments

Comments
 (0)