Skip to content
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

update keys in browserstack.json #19

Merged
merged 2 commits into from
May 15, 2020
Merged

update keys in browserstack.json #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5513ca6
update keys in browserstack.json
nagpalkaran95 May 12, 2020
7e12e3e
remove unwanted usage of baseUrl
nagpalkaran95 May 12, 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
12 changes: 4 additions & 8 deletions bin/helpers/capabilityHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,18 @@ const caps = (bsConfig, zip) => {

// Local Identifier
obj.localIdentifier = null;
if (obj.local === true && bsConfig.connection_settings.localIdentifier)
if (obj.local === true && (bsConfig.connection_settings.localIdentifier || bsConfig.connection_settings.local_identifier))
{
obj.localIdentifier = bsConfig.connection_settings.localIdentifier;
obj.localIdentifier = bsConfig.connection_settings.localIdentifier || bsConfig.connection_settings.local_identifier;
logger.log(`Local Identifier is set to: ${obj.localIdentifier}`);
}

// Project name
obj.project = bsConfig.run_settings.project
obj.project = bsConfig.run_settings.project || bsConfig.run_settings.project_name;
if (!obj.project) logger.log(`Project name is: ${obj.project}`);

// Base url
obj.base_url = bsConfig.run_settings.baseUrl
if (obj.base_url) logger.log(`Base url is : ${obj.base_url}`);

// Build name
obj.customBuildName = bsConfig.run_settings.customBuildName
obj.customBuildName = bsConfig.run_settings.customBuildName || bsConfig.run_settings.build_name;
if (obj.customBuildName) logger.log(`Build name is: ${obj.customBuildName}`);

//callback url
Expand Down
6 changes: 3 additions & 3 deletions bin/templates/configTemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ module.exports = function () {
],
"run_settings": {
"cypress_proj_dir" : "/path/to/cypress.json",
"project": "project-name",
"customBuildName": "build-name"
"project_name": "project-name",
"build_name": "build-name"
},
"connection_settings": {
"local": false,
"localIdentifier": null
"local_identifier": null
}
}
var EOL = require('os').EOL
Expand Down