Skip to content

Commit 16ec8a2

Browse files
suryartsuryart
authored
Merge pull request #89 from browserstack/CYP_523_npm_dep
Add default object for npm_dependencies
2 parents bd35f64 + 8260d05 commit 16ec8a2

File tree

8 files changed

+63
-61
lines changed

8 files changed

+63
-61
lines changed

‎bin/commands/info.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ module.exports = function info(args) {
1010
let bsConfigPath = utils.getConfigPath(args.cf);
1111

1212
return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
13-
// setting setDefaultAuthHash to {} if not present and set via env variables or via args.
14-
utils.setDefaultAuthHash(bsConfig, args);
15-
13+
utils.setDefaults(bsConfig, args);
14+
1615
// accept the username from command line if provided
1716
utils.setUsername(bsConfig, args);
1817

‎bin/commands/runs.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ module.exports = function run(args) {
1717
return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
1818
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
1919

20-
// setting setDefaultAuthHash to {} if not present and set via env variables or via args.
21-
utils.setDefaultAuthHash(bsConfig,args);
20+
utils.setDefaults(bsConfig, args);
2221

2322
// accept the username from command line or env variable if provided
2423
utils.setUsername(bsConfig, args);

‎bin/commands/stop.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ module.exports = function stop(args) {
1010
let bsConfigPath = utils.getConfigPath(args.cf);
1111

1212
return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
13-
// setting setDefaultAuthHash to {} if not present and set via env variables or via args.
14-
utils.setDefaultAuthHash(bsConfig, args);
15-
13+
utils.setDefaults(bsConfig, args);
14+
1615
// accept the username from command line if provided
1716
utils.setUsername(bsConfig, args);
1817

‎bin/helpers/utils.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,16 @@ exports.setParallels = (bsConfig, args) => {
115115
}
116116
};
117117

118-
exports.setDefaultAuthHash = (bsConfig, args) => {
119-
if (
120-
this.isUndefined(bsConfig['auth']) &&
121-
(!this.isUndefined(args.username) ||
122-
!this.isUndefined(process.env.BROWSERSTACK_USERNAME))
123-
) {
118+
exports.setDefaults = (bsConfig, args) => {
119+
// setting setDefaultAuthHash to {} if not present and set via env variables or via args.
120+
if (this.isUndefined(bsConfig['auth']) && (!this.isUndefined(args.username) || !this.isUndefined(process.env.BROWSERSTACK_USERNAME))) {
124121
bsConfig['auth'] = {};
125122
}
123+
124+
// setting npm_dependencies to {} if not present
125+
if (bsConfig.run_settings && this.isUndefined(bsConfig.run_settings.npm_dependencies)) {
126+
bsConfig.run_settings.npm_dependencies = {}
127+
}
126128
}
127129

128130
exports.setUsername = (bsConfig, args) => {

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe("buildInfo", () => {
3333
return "end";
3434
});
3535
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
36-
setDefaultAuthHashStub = sandbox.stub();
36+
setDefaultsStub = sandbox.stub();
3737
});
3838

3939
afterEach(() => {
@@ -59,7 +59,7 @@ describe("buildInfo", () => {
5959
setCypressConfigFilename: setCypressConfigFilenameStub,
6060
getUserAgent: getUserAgentStub,
6161
getConfigPath: getConfigPathStub,
62-
setDefaultAuthHash: setDefaultAuthHashStub
62+
setDefaults: setDefaultsStub
6363
},
6464
request: {get: requestStub},
6565
});
@@ -97,7 +97,7 @@ describe("buildInfo", () => {
9797
setCypressConfigFilename: setCypressConfigFilenameStub,
9898
getUserAgent: getUserAgentStub,
9999
getConfigPath: getConfigPathStub,
100-
setDefaultAuthHash: setDefaultAuthHashStub
100+
setDefaults: setDefaultsStub
101101
},
102102
request: {get: requestStub},
103103
});
@@ -131,7 +131,7 @@ describe("buildInfo", () => {
131131
return "end";
132132
});
133133
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
134-
setDefaultAuthHashStub = sandbox.stub();
134+
setDefaultsStub = sandbox.stub();
135135
});
136136

137137
afterEach(() => {
@@ -159,7 +159,7 @@ describe("buildInfo", () => {
159159
setCypressConfigFilename: setCypressConfigFilenameStub,
160160
getUserAgent: getUserAgentStub,
161161
getConfigPath: getConfigPathStub,
162-
setDefaultAuthHash: setDefaultAuthHashStub
162+
setDefaults: setDefaultsStub
163163
},
164164
request: {get: requestStub},
165165
});
@@ -203,7 +203,7 @@ describe("buildInfo", () => {
203203
setCypressConfigFilename: setCypressConfigFilenameStub,
204204
getUserAgent: getUserAgentStub,
205205
getConfigPath: getConfigPathStub,
206-
setDefaultAuthHash: setDefaultAuthHashStub
206+
setDefaults: setDefaultsStub
207207
},
208208
request: {get: requestStub},
209209
});
@@ -242,7 +242,7 @@ describe("buildInfo", () => {
242242
setCypressConfigFilename: setCypressConfigFilenameStub,
243243
getUserAgent: getUserAgentStub,
244244
getConfigPath: getConfigPathStub,
245-
setDefaultAuthHash: setDefaultAuthHashStub
245+
setDefaults: setDefaultsStub
246246
},
247247
request: {get: requestStub},
248248
});
@@ -278,7 +278,7 @@ describe("buildInfo", () => {
278278
return "end";
279279
});
280280
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
281-
setDefaultAuthHashStub = sandbox.stub();
281+
setDefaultsStub = sandbox.stub();
282282
});
283283

284284
afterEach(() => {
@@ -304,7 +304,7 @@ describe("buildInfo", () => {
304304
setCypressConfigFilename: setCypressConfigFilenameStub,
305305
getUserAgent: getUserAgentStub,
306306
getConfigPath: getConfigPathStub,
307-
setDefaultAuthHash: setDefaultAuthHashStub
307+
setDefaults: setDefaultsStub
308308
},
309309
request: {get: requestStub},
310310
});
@@ -338,7 +338,7 @@ describe("buildInfo", () => {
338338
return "end";
339339
});
340340
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
341-
setDefaultAuthHashStub = sandbox.stub();
341+
setDefaultsStub = sandbox.stub();
342342
});
343343

344344
afterEach(() => {
@@ -357,7 +357,7 @@ describe("buildInfo", () => {
357357
setUsageReportingFlag: setUsageReportingFlagStub,
358358
setCypressConfigFilename: setCypressConfigFilenameStub,
359359
getConfigPath: getConfigPathStub,
360-
setDefaultAuthHash: setDefaultAuthHashStub
360+
setDefaults: setDefaultsStub
361361
},
362362
});
363363

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ describe("runs", () => {
9898
setLocalStub = sandbox.stub();
9999
setLocalIdentifierStub = sandbox.stub();
100100
deleteResultsStub = sandbox.stub();
101-
setDefaultAuthHashStub = sandbox.stub();
101+
setDefaultsStub = sandbox.stub();
102102
});
103103

104104
afterEach(() => {
@@ -127,7 +127,7 @@ describe("runs", () => {
127127
setLocal: setLocalStub,
128128
setLocalIdentifier: setLocalIdentifierStub,
129129
deleteResults: deleteResultsStub,
130-
setDefaultAuthHash: setDefaultAuthHashStub
130+
setDefaults: setDefaultsStub
131131
},
132132
'../helpers/capabilityHelper': {
133133
validate: capabilityValidatorStub,
@@ -151,7 +151,7 @@ describe("runs", () => {
151151
sinon.assert.calledOnce(setLocalStub);
152152
sinon.assert.calledOnce(setLocalIdentifierStub);
153153
sinon.assert.calledOnce(deleteResultsStub);
154-
sinon.assert.calledOnce(setDefaultAuthHashStub);
154+
sinon.assert.calledOnce(setDefaultsStub);
155155
sinon.assert.calledOnceWithExactly(
156156
sendUsageReportStub,
157157
bsConfig,
@@ -188,7 +188,7 @@ describe("runs", () => {
188188
setLocalStub = sandbox.stub();
189189
setLocalIdentifierStub = sandbox.stub();
190190
deleteResultsStub = sandbox.stub();
191-
setDefaultAuthHashStub = sandbox.stub();
191+
setDefaultsStub = sandbox.stub();
192192
});
193193

194194
afterEach(() => {
@@ -217,7 +217,7 @@ describe("runs", () => {
217217
setLocal: setLocalStub,
218218
setLocalIdentifier: setLocalIdentifierStub,
219219
deleteResults: deleteResultsStub,
220-
setDefaultAuthHash: setDefaultAuthHashStub
220+
setDefaults: setDefaultsStub
221221
},
222222
'../helpers/capabilityHelper': {
223223
validate: capabilityValidatorStub,
@@ -250,7 +250,7 @@ describe("runs", () => {
250250
sinon.assert.calledOnce(setUsageReportingFlagStub);
251251
sinon.assert.calledOnce(deleteZipStub);
252252
sinon.assert.calledOnce(deleteResultsStub);
253-
sinon.assert.calledOnce(setDefaultAuthHashStub);
253+
sinon.assert.calledOnce(setDefaultsStub);
254254
sinon.assert.calledOnceWithExactly(
255255
sendUsageReportStub,
256256
bsConfig,
@@ -288,7 +288,7 @@ describe("runs", () => {
288288
setLocalStub = sandbox.stub();
289289
setLocalIdentifierStub = sandbox.stub();
290290
deleteResultsStub = sandbox.stub();
291-
setDefaultAuthHashStub = sandbox.stub();
291+
setDefaultsStub = sandbox.stub();
292292
});
293293

294294
afterEach(() => {
@@ -317,7 +317,7 @@ describe("runs", () => {
317317
setLocal: setLocalStub,
318318
setLocalIdentifier: setLocalIdentifierStub,
319319
deleteResults: deleteResultsStub,
320-
setDefaultAuthHash: setDefaultAuthHashStub
320+
setDefaults: setDefaultsStub
321321
},
322322
'../helpers/capabilityHelper': {
323323
validate: capabilityValidatorStub,
@@ -354,7 +354,7 @@ describe("runs", () => {
354354
sinon.assert.calledOnce(setUsageReportingFlagStub);
355355
sinon.assert.calledOnce(zipUploadStub);
356356
sinon.assert.calledOnce(deleteResultsStub);
357-
sinon.assert.calledOnce(setDefaultAuthHashStub);
357+
sinon.assert.calledOnce(setDefaultsStub);
358358
sinon.assert.calledOnceWithExactly(
359359
sendUsageReportStub,
360360
bsConfig,
@@ -396,7 +396,7 @@ describe("runs", () => {
396396
setLocalStub = sandbox.stub();
397397
setLocalIdentifierStub = sandbox.stub();
398398
deleteResultsStub = sandbox.stub();
399-
setDefaultAuthHashStub = sandbox.stub();
399+
setDefaultsStub = sandbox.stub();
400400
});
401401

402402
afterEach(() => {
@@ -425,7 +425,7 @@ describe("runs", () => {
425425
setLocal: setLocalStub,
426426
setLocalIdentifier: setLocalIdentifierStub,
427427
deleteResults: deleteResultsStub,
428-
setDefaultAuthHash: setDefaultAuthHashStub
428+
setDefaults: setDefaultsStub
429429
},
430430
'../helpers/capabilityHelper': {
431431
validate: capabilityValidatorStub,
@@ -471,7 +471,7 @@ describe("runs", () => {
471471

472472
sinon.assert.calledOnce(sendUsageReportStub);
473473
sinon.assert.calledOnce(deleteResultsStub);
474-
sinon.assert.calledOnce(setDefaultAuthHashStub);
474+
sinon.assert.calledOnce(setDefaultsStub);
475475

476476
sinon.assert.calledOnceWithExactly(
477477
sendUsageReportStub,
@@ -515,7 +515,7 @@ describe("runs", () => {
515515
deleteZipStub = sandbox.stub();
516516
exportResultsStub = sandbox.stub();
517517
deleteResultsStub = sandbox.stub();
518-
setDefaultAuthHashStub = sandbox.stub();
518+
setDefaultsStub = sandbox.stub();
519519
isUndefinedStub = sandbox.stub();
520520
setLocalStub = sandbox.stub();
521521
setLocalIdentifierStub = sandbox.stub();
@@ -549,7 +549,7 @@ describe("runs", () => {
549549
setLocalIdentifier: setLocalIdentifierStub,
550550
exportResults: exportResultsStub,
551551
deleteResults: deleteResultsStub,
552-
setDefaultAuthHash: setDefaultAuthHashStub,
552+
setDefaults: setDefaultsStub,
553553
isUndefined: isUndefinedStub
554554
},
555555
"../helpers/capabilityHelper": {
@@ -598,7 +598,7 @@ describe("runs", () => {
598598
sinon.assert.calledOnce(createBuildStub);
599599
sinon.assert.calledOnce(exportResultsStub);
600600
sinon.assert.calledOnce(deleteResultsStub);
601-
sinon.assert.calledOnce(setDefaultAuthHashStub);
601+
sinon.assert.calledOnce(setDefaultsStub);
602602
sinon.assert.calledOnceWithExactly(
603603
sendUsageReportStub,
604604
bsConfig,

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe("buildStop", () => {
3333
return "end";
3434
});
3535
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
36-
setDefaultAuthHashStub = sandbox.stub();
36+
setDefaultsStub = sandbox.stub();
3737
});
3838

3939
afterEach(() => {
@@ -61,7 +61,7 @@ describe("buildStop", () => {
6161
setCypressConfigFilename: setCypressConfigFilenameStub,
6262
getUserAgent: getUserAgentStub,
6363
getConfigPath: getConfigPathStub,
64-
setDefaultAuthHash: setDefaultAuthHashStub
64+
setDefaults: setDefaultsStub
6565
},
6666
request: {post: requestStub},
6767
});
@@ -99,7 +99,7 @@ describe("buildStop", () => {
9999
setCypressConfigFilename: setCypressConfigFilenameStub,
100100
getUserAgent: getUserAgentStub,
101101
getConfigPath: getConfigPathStub,
102-
setDefaultAuthHash: setDefaultAuthHashStub
102+
setDefaults: setDefaultsStub
103103
},
104104
request: {post: requestStub},
105105
});
@@ -132,7 +132,7 @@ describe("buildStop", () => {
132132
return "end";
133133
});
134134
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
135-
setDefaultAuthHashStub = sandbox.stub();
135+
setDefaultsStub = sandbox.stub();
136136
});
137137

138138
afterEach(() => {
@@ -160,7 +160,7 @@ describe("buildStop", () => {
160160
setCypressConfigFilename: setCypressConfigFilenameStub,
161161
getUserAgent: getUserAgentStub,
162162
getConfigPath: getConfigPathStub,
163-
setDefaultAuthHash: setDefaultAuthHashStub
163+
setDefaults: setDefaultsStub
164164
},
165165
request: {post: requestStub},
166166
});
@@ -205,7 +205,7 @@ describe("buildStop", () => {
205205
setCypressConfigFilename: setCypressConfigFilenameStub,
206206
getUserAgent: getUserAgentStub,
207207
getConfigPath: getConfigPathStub,
208-
setDefaultAuthHash: setDefaultAuthHashStub
208+
setDefaults: setDefaultsStub
209209
},
210210
request: {post: requestStub},
211211
});
@@ -245,7 +245,7 @@ describe("buildStop", () => {
245245
setCypressConfigFilename: setCypressConfigFilenameStub,
246246
getUserAgent: getUserAgentStub,
247247
getConfigPath: getConfigPathStub,
248-
setDefaultAuthHash: setDefaultAuthHashStub
248+
setDefaults: setDefaultsStub
249249
},
250250
request: {post: requestStub},
251251
});
@@ -280,7 +280,7 @@ describe("buildStop", () => {
280280
return "end";
281281
});
282282
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
283-
setDefaultAuthHashStub = sandbox.stub();
283+
setDefaultsStub = sandbox.stub();
284284
});
285285

286286
afterEach(() => {
@@ -308,7 +308,7 @@ describe("buildStop", () => {
308308
setCypressConfigFilename: setCypressConfigFilenameStub,
309309
getUserAgent: getUserAgentStub,
310310
getConfigPath: getConfigPathStub,
311-
setDefaultAuthHash: setDefaultAuthHashStub
311+
setDefaults: setDefaultsStub
312312
},
313313
request: {post: requestStub},
314314
});
@@ -342,7 +342,7 @@ describe("buildStop", () => {
342342
return "end";
343343
});
344344
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
345-
setDefaultAuthHashStub = sandbox.stub();
345+
setDefaultsStub = sandbox.stub();
346346
});
347347

348348
afterEach(() => {
@@ -361,7 +361,7 @@ describe("buildStop", () => {
361361
setUsageReportingFlag: setUsageReportingFlagStub,
362362
setCypressConfigFilename: setCypressConfigFilenameStub,
363363
getConfigPath: getConfigPathStub,
364-
setDefaultAuthHash: setDefaultAuthHashStub
364+
setDefaults: setDefaultsStub
365365
},
366366
});
367367

0 commit comments

Comments
 (0)