Skip to content

Fix auto_import_dev_dependencies capability conflicts #1048

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

Open
amaanbs wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

Fix auto_import_dev_dependencies capability conflicts #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion bin/helpers/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ exports.setBrowserstackCypressCliDependency = (bsConfig) => {
if (runSettings.npm_dependencies !== undefined &&
typeof runSettings.npm_dependencies === 'object') {
if (!("browserstack-cypress-cli" in runSettings.npm_dependencies)) {
logger.warn("Missing browserstack-cypress-cli not found in npm_dependencies");
logger.warn("Missing browserstack-cypress-cli not found in npm_dependencies");
runSettings.npm_dependencies['browserstack-cypress-cli'] = this.getAgentVersion() || "latest";
logger.warn(`Adding browserstack-cypress-cli version ${runSettings.npm_dependencies['browserstack-cypress-cli']} in npm_dependencies`);
}
Expand Down
4 changes: 2 additions & 2 deletions bin/helpers/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1986,7 +1986,7 @@ exports.ensureBrowserstackCypressCliDependency = (npmDependencies) => {
} catch (err) {
logger.debug("Could not read package.json version, using 'latest'");
}

npmDependencies['browserstack-cypress-cli'] = version;
logger.warn(`Adding browserstack-cypress-cli version ${version} in npm_dependencies`);
};
Expand All @@ -1996,7 +1996,7 @@ exports.processAutoImportDependencies = (runSettings) => {
exports.validateAutoImportConflict(runSettings);

// Skip processing if auto_import_dev_dependencies is not enabled
if (!runSettings.auto_import_dev_dependencies) {
if (runSettings.auto_import_dev_dependencies != true) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion bin/testhub/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ exports.setTestObservabilityVariables = (
responseData.observability.options.allow_screenshots.toString(),
requestData.framework_details.sdkVersion
);
helper.setBrowserstackCypressCliDependency(user_config);
if(user_config.run_settings.auto_import_dev_dependencies != true) helper.setBrowserstackCypressCliDependency(user_config);
return [
responseData.jwt,
responseData.build_hashed_id,
Expand Down