Skip to content

Merge HST_1963_cypress_folder #969

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
bsautomation merged 1 commit into from
Feb 18, 2025
Merged

Merge HST_1963_cypress_folder #969

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
18 changes: 10 additions & 8 deletions bin/helpers/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,15 +1179,17 @@ exports.getNumberOfSpecFiles = (bsConfig, args, cypressConfig, turboScaleSession
logger.debug(`${files ? files.length : 0} spec files found`);

if (turboScaleSession) {
if (bsConfig.run_settings.turboScaleOptions && bsConfig.run_settings.turboScaleOptions.integrationFolder) {
// this is in case the user's project does not use the default path 'cypress/e2e'
// add integrationFolder in turboScaleOptions in browserstack.json
testFolderPath = bsConfig.run_settings.turboScaleOptions.integrationFolder;
if (bsConfig.run_settings.cypress_config_file && bsConfig.run_settings.cypress_config_filename !== 'false') {
const configFilePath = path.resolve(bsConfig.run_settings.cypressConfigFilePath);
const directory = path.join(path.dirname(configFilePath), '/');
// remove unwanted path prefix for turboscale
files = files.map((x) => { return path.join('', x.split(directory)[1]) })
// setting specs for turboScale as we don't have patched API for turboscale so we will rely on info from CLI
bsConfig.run_settings.specs = files;
} else {
files = files.map((x) => { return path.join(testFolderPath, x.split(testFolderPath)[1]) })
bsConfig.run_settings.specs = files;
}
// remove unwanted path prefix for turboscale
files = files.map((x) => { return path.join(testFolderPath, x.split(testFolderPath)[1]) })
// setting specs for turboScale as we don't have patched API for turboscale so we will rely on info from CLI
bsConfig.run_settings.specs = files;
}
return files;
};
Expand Down