Skip to content

Commit 5d2bc85

Browse files
committed
Merge branch 'master' of github.com:roshan04/browserstack-cypress-cli
2 parents 5293608 + f14755b commit 5d2bc85

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

bin/helpers/constants.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ const validationMessages = {
120120
EMPTY_RUN_SETTINGS: "Empty run settings",
121121
EMPTY_CYPRESS_PROJ_DIR:
122122
"cypress_proj_dir is not set in run_settings. See https://www.browserstack.com/docs/automate/cypress/sample-tutorial to learn more.",
123-
EMPTY_CYPRESS_CONFIG_FILE:
123+
EMPTY_CYPRESS_CONFIG_FILE:
124124
"cypress_config_file is not set in run_settings. See https://www.browserstack.com/docs/automate/cypress/configuration-file to learn more.",
125125
VALIDATED: "browserstack.json file is validated",
126126
NOT_VALID: "browerstack.json is not valid",
@@ -129,9 +129,9 @@ const validationMessages = {
129129
INVALID_PARALLELS_CONFIGURATION:
130130
"Invalid value specified for parallels to use. Maximum parallels to use should be a number greater than 0.",
131131
INVALID_CYPRESS_CONFIG_FILE: "Invalid cypress_config_file",
132-
CYPRESS_CONFIG_FILE_NOT_FOUND:
132+
CYPRESS_CONFIG_FILE_NOT_FOUND:
133133
"No cypress config file was found at <location> directory.",
134-
MORE_THAN_ONE_CYPRESS_CONFIG_FILE_FOUND:
134+
MORE_THAN_ONE_CYPRESS_CONFIG_FILE_FOUND:
135135
"Cypress does not allow more than one cypress config file.",
136136
INVALID_CYPRESS_JSON: "cypress.json is not a valid json",
137137
INVALID_DEFAULT_AUTH_PARAMS:
@@ -307,16 +307,23 @@ const allowedFileTypes = [
307307
"pmp",
308308
"max",
309309
"mjpeg",
310-
"y4m"
310+
"y4m",
311+
"tsx",
312+
"pfx",
313+
"cfr",
311314
];
312315

313316
const filesToIgnoreWhileUploading = [
314317
"**/node_modules/**",
315318
"node_modules/**",
316319
"package-lock.json",
320+
"**/package-lock.json",
317321
"package.json",
322+
"**/package.json",
318323
"browserstack-package.json",
324+
"**/browserstack-package.json",
319325
"tests.zip",
326+
"**/tests.zip",
320327
"cypress.json",
321328
"cypress.config.js",
322329
"cypress.config.ts",

bin/helpers/usageReporting.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ function isUsageReportingEnabled() {
173173
}
174174

175175
function redactBsConfig(bsConfig) {
176-
if(typeof bsConfig === 'object' && !utils.isUndefined(bsConfig.run_settings)) {
176+
if(typeof bsConfig === 'object' && !utils.isUndefined(bsConfig) && !utils.isUndefined(bsConfig.run_settings)) {
177177
if(!utils.isUndefined(bsConfig.run_settings["projectId"])) { bsConfig.run_settings["projectId"] = REDACTED }
178178
if(!utils.isUndefined(bsConfig.run_settings["record-key"])) { bsConfig.run_settings["record-key"] = REDACTED }
179179
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "browserstack-cypress-cli",
3-
"version": "1.19.0",
3+
"version": "1.19.3",
44
"description": "BrowserStack Cypress CLI for Cypress integration with BrowserStack's remote devices.",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)