Skip to content

Add default object for npm_dependencies #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 9, 2020
Merged

Add default object for npm_dependencies #89

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
72e9efd
Add default object for npm_depencies
nagpalkaran95 Nov 6, 2020
e03b496
move the func to utils
nagpalkaran95 Nov 6, 2020
b03a873
refactor
nagpalkaran95 Nov 6, 2020
04a376e
update unit test cases
nagpalkaran95 Nov 6, 2020
8260d05
add unit test cases
nagpalkaran95 Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions bin/commands/info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ module.exports = function info(args) {
let bsConfigPath = utils.getConfigPath(args.cf);

return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
// setting setDefaultAuthHash to {} if not present and set via env variables or via args.
utils.setDefaultAuthHash(bsConfig, args);

utils.setDefaults(bsConfig, args);

// accept the username from command line if provided
utils.setUsername(bsConfig, args);

Expand Down
3 changes: 1 addition & 2 deletions bin/commands/runs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ module.exports = function run(args) {
return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);

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

// accept the username from command line or env variable if provided
utils.setUsername(bsConfig, args);
Expand Down
5 changes: 2 additions & 3 deletions bin/commands/stop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ module.exports = function stop(args) {
let bsConfigPath = utils.getConfigPath(args.cf);

return utils.validateBstackJson(bsConfigPath).then(function (bsConfig) {
// setting setDefaultAuthHash to {} if not present and set via env variables or via args.
utils.setDefaultAuthHash(bsConfig, args);

utils.setDefaults(bsConfig, args);

// accept the username from command line if provided
utils.setUsername(bsConfig, args);

Expand Down
14 changes: 8 additions & 6 deletions bin/helpers/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,16 @@ exports.setParallels = (bsConfig, args) => {
}
};

exports.setDefaultAuthHash = (bsConfig, args) => {
if (
this.isUndefined(bsConfig['auth']) &&
(!this.isUndefined(args.username) ||
!this.isUndefined(process.env.BROWSERSTACK_USERNAME))
) {
exports.setDefaults = (bsConfig, args) => {
// setting setDefaultAuthHash to {} if not present and set via env variables or via args.
if (this.isUndefined(bsConfig['auth']) && (!this.isUndefined(args.username) || !this.isUndefined(process.env.BROWSERSTACK_USERNAME))) {
bsConfig['auth'] = {};
}

// setting npm_dependencies to {} if not present
if (bsConfig.run_settings && this.isUndefined(bsConfig.run_settings.npm_dependencies)) {
bsConfig.run_settings.npm_dependencies = {}
}
}

exports.setUsername = (bsConfig, args) => {
Expand Down
22 changes: 11 additions & 11 deletions test/unit/bin/commands/info.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe("buildInfo", () => {
return "end";
});
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand All @@ -59,7 +59,7 @@ describe("buildInfo", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {get: requestStub},
});
Expand Down Expand Up @@ -97,7 +97,7 @@ describe("buildInfo", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {get: requestStub},
});
Expand Down Expand Up @@ -131,7 +131,7 @@ describe("buildInfo", () => {
return "end";
});
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand Down Expand Up @@ -159,7 +159,7 @@ describe("buildInfo", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {get: requestStub},
});
Expand Down Expand Up @@ -203,7 +203,7 @@ describe("buildInfo", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {get: requestStub},
});
Expand Down Expand Up @@ -242,7 +242,7 @@ describe("buildInfo", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {get: requestStub},
});
Expand Down Expand Up @@ -278,7 +278,7 @@ describe("buildInfo", () => {
return "end";
});
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand All @@ -304,7 +304,7 @@ describe("buildInfo", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {get: requestStub},
});
Expand Down Expand Up @@ -338,7 +338,7 @@ describe("buildInfo", () => {
return "end";
});
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand All @@ -357,7 +357,7 @@ describe("buildInfo", () => {
setUsageReportingFlag: setUsageReportingFlagStub,
setCypressConfigFilename: setCypressConfigFilenameStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
});

Expand Down
30 changes: 15 additions & 15 deletions test/unit/bin/commands/runs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ describe("runs", () => {
setLocalStub = sandbox.stub();
setLocalIdentifierStub = sandbox.stub();
deleteResultsStub = sandbox.stub();
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand Down Expand Up @@ -127,7 +127,7 @@ describe("runs", () => {
setLocal: setLocalStub,
setLocalIdentifier: setLocalIdentifierStub,
deleteResults: deleteResultsStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
'../helpers/capabilityHelper': {
validate: capabilityValidatorStub,
Expand All @@ -151,7 +151,7 @@ describe("runs", () => {
sinon.assert.calledOnce(setLocalStub);
sinon.assert.calledOnce(setLocalIdentifierStub);
sinon.assert.calledOnce(deleteResultsStub);
sinon.assert.calledOnce(setDefaultAuthHashStub);
sinon.assert.calledOnce(setDefaultsStub);
sinon.assert.calledOnceWithExactly(
sendUsageReportStub,
bsConfig,
Expand Down Expand Up @@ -188,7 +188,7 @@ describe("runs", () => {
setLocalStub = sandbox.stub();
setLocalIdentifierStub = sandbox.stub();
deleteResultsStub = sandbox.stub();
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand Down Expand Up @@ -217,7 +217,7 @@ describe("runs", () => {
setLocal: setLocalStub,
setLocalIdentifier: setLocalIdentifierStub,
deleteResults: deleteResultsStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
'../helpers/capabilityHelper': {
validate: capabilityValidatorStub,
Expand Down Expand Up @@ -250,7 +250,7 @@ describe("runs", () => {
sinon.assert.calledOnce(setUsageReportingFlagStub);
sinon.assert.calledOnce(deleteZipStub);
sinon.assert.calledOnce(deleteResultsStub);
sinon.assert.calledOnce(setDefaultAuthHashStub);
sinon.assert.calledOnce(setDefaultsStub);
sinon.assert.calledOnceWithExactly(
sendUsageReportStub,
bsConfig,
Expand Down Expand Up @@ -288,7 +288,7 @@ describe("runs", () => {
setLocalStub = sandbox.stub();
setLocalIdentifierStub = sandbox.stub();
deleteResultsStub = sandbox.stub();
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand Down Expand Up @@ -317,7 +317,7 @@ describe("runs", () => {
setLocal: setLocalStub,
setLocalIdentifier: setLocalIdentifierStub,
deleteResults: deleteResultsStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
'../helpers/capabilityHelper': {
validate: capabilityValidatorStub,
Expand Down Expand Up @@ -354,7 +354,7 @@ describe("runs", () => {
sinon.assert.calledOnce(setUsageReportingFlagStub);
sinon.assert.calledOnce(zipUploadStub);
sinon.assert.calledOnce(deleteResultsStub);
sinon.assert.calledOnce(setDefaultAuthHashStub);
sinon.assert.calledOnce(setDefaultsStub);
sinon.assert.calledOnceWithExactly(
sendUsageReportStub,
bsConfig,
Expand Down Expand Up @@ -396,7 +396,7 @@ describe("runs", () => {
setLocalStub = sandbox.stub();
setLocalIdentifierStub = sandbox.stub();
deleteResultsStub = sandbox.stub();
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand Down Expand Up @@ -425,7 +425,7 @@ describe("runs", () => {
setLocal: setLocalStub,
setLocalIdentifier: setLocalIdentifierStub,
deleteResults: deleteResultsStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
'../helpers/capabilityHelper': {
validate: capabilityValidatorStub,
Expand Down Expand Up @@ -471,7 +471,7 @@ describe("runs", () => {

sinon.assert.calledOnce(sendUsageReportStub);
sinon.assert.calledOnce(deleteResultsStub);
sinon.assert.calledOnce(setDefaultAuthHashStub);
sinon.assert.calledOnce(setDefaultsStub);

sinon.assert.calledOnceWithExactly(
sendUsageReportStub,
Expand Down Expand Up @@ -515,7 +515,7 @@ describe("runs", () => {
deleteZipStub = sandbox.stub();
exportResultsStub = sandbox.stub();
deleteResultsStub = sandbox.stub();
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
isUndefinedStub = sandbox.stub();
setLocalStub = sandbox.stub();
setLocalIdentifierStub = sandbox.stub();
Expand Down Expand Up @@ -549,7 +549,7 @@ describe("runs", () => {
setLocalIdentifier: setLocalIdentifierStub,
exportResults: exportResultsStub,
deleteResults: deleteResultsStub,
setDefaultAuthHash: setDefaultAuthHashStub,
setDefaults: setDefaultsStub,
isUndefined: isUndefinedStub
},
"../helpers/capabilityHelper": {
Expand Down Expand Up @@ -598,7 +598,7 @@ describe("runs", () => {
sinon.assert.calledOnce(createBuildStub);
sinon.assert.calledOnce(exportResultsStub);
sinon.assert.calledOnce(deleteResultsStub);
sinon.assert.calledOnce(setDefaultAuthHashStub);
sinon.assert.calledOnce(setDefaultsStub);
sinon.assert.calledOnceWithExactly(
sendUsageReportStub,
bsConfig,
Expand Down
22 changes: 11 additions & 11 deletions test/unit/bin/commands/stop.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe("buildStop", () => {
return "end";
});
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand Down Expand Up @@ -61,7 +61,7 @@ describe("buildStop", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {post: requestStub},
});
Expand Down Expand Up @@ -99,7 +99,7 @@ describe("buildStop", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {post: requestStub},
});
Expand Down Expand Up @@ -132,7 +132,7 @@ describe("buildStop", () => {
return "end";
});
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand Down Expand Up @@ -160,7 +160,7 @@ describe("buildStop", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {post: requestStub},
});
Expand Down Expand Up @@ -205,7 +205,7 @@ describe("buildStop", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {post: requestStub},
});
Expand Down Expand Up @@ -245,7 +245,7 @@ describe("buildStop", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {post: requestStub},
});
Expand Down Expand Up @@ -280,7 +280,7 @@ describe("buildStop", () => {
return "end";
});
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand Down Expand Up @@ -308,7 +308,7 @@ describe("buildStop", () => {
setCypressConfigFilename: setCypressConfigFilenameStub,
getUserAgent: getUserAgentStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
request: {post: requestStub},
});
Expand Down Expand Up @@ -342,7 +342,7 @@ describe("buildStop", () => {
return "end";
});
getErrorCodeFromErrStub = sandbox.stub().returns("random-error");
setDefaultAuthHashStub = sandbox.stub();
setDefaultsStub = sandbox.stub();
});

afterEach(() => {
Expand All @@ -361,7 +361,7 @@ describe("buildStop", () => {
setUsageReportingFlag: setUsageReportingFlagStub,
setCypressConfigFilename: setCypressConfigFilenameStub,
getConfigPath: getConfigPathStub,
setDefaultAuthHash: setDefaultAuthHashStub
setDefaults: setDefaultsStub
},
});

Expand Down
Loading