From ac1063fe2fa8169b88c918902f0f62009864ed2b Mon Sep 17 00:00:00 2001 From: Rohan <142411639+Rohannagariya1@users.noreply.github.com> Date: Tue, 4 Mar 2025 18:16:10 +0530 Subject: [PATCH 1/4] added changes for RBFCU FIX --- bin/helpers/atsHelper.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/helpers/atsHelper.js b/bin/helpers/atsHelper.js index 90fed779..05db82fa 100644 --- a/bin/helpers/atsHelper.js +++ b/bin/helpers/atsHelper.js @@ -2,7 +2,7 @@ const path = require('path'); const fs = require('fs'); const { consoleHolder } = require('../testObservability/helper/constants'); const HttpsProxyAgent = require('https-proxy-agent'); - +const { v4: uuidv4 } = require('uuid'); const axios = require('axios'), logger = require('./logger').winstonLogger, utils = require('./utils'), @@ -108,7 +108,9 @@ exports.patchCypressConfigFileContent = (bsConfig) => { let confPath = bsConfig.run_settings.cypress_config_file; let patchedConfPathList = confPath.split(path.sep); - patchedConfPathList[patchedConfPathList.length - 1] = 'patched_ats_config_file.js' + const uniqueNamePatchFileName = `patched_ats_config_file_${uuidv4()}.js`; + patchedConfPathList[patchedConfPathList.length - 1] = uniqueNamePatchFileName; + logger.info("Patch file name is " + uniqueNamePatchFileName); const patchedConfPath = patchedConfPathList.join(path.sep); bsConfig.run_settings.patched_cypress_config_file = patchedConfPath; From 209cf98774ad00b3aa0d1d43c62979aff3a203d5 Mon Sep 17 00:00:00 2001 From: Rohan <142411639+Rohannagariya1@users.noreply.github.com> Date: Tue, 4 Mar 2025 18:17:54 +0530 Subject: [PATCH 2/4] package changes --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 1cf5072e..3663bc53 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "browserstack-local": "1.5.4", "chalk": "4.1.2", "cli-progress": "^3.10.0", + "decompress": "4.2.1", "form-data": "^4.0.0", "fs-extra": "8.1.0", "getmac": "5.20.0", @@ -26,17 +27,16 @@ "git-repo-info": "^2.1.1", "gitconfiglocal": "^2.1.0", "glob": "^7.2.0", - "mocha": "^10.2.0", "mkdirp": "1.0.4", + "mocha": "^10.2.0", "node-ipc": "9.1.1", "table": "5.4.6", + "unzipper": "^0.12.3", "update-notifier": "7.0.0", - "uuid": "8.3.2", + "uuid": "^8.3.2", "windows-release": "^5.1.0", "winston": "2.4.4", - "yargs": "14.2.3", - "decompress": "4.2.1", - "unzipper": "^0.12.3" + "yargs": "14.2.3" }, "repository": { "type": "git", From 4401416b11fa08922974440017228bf30378bb79 Mon Sep 17 00:00:00 2001 From: Rohan <142411639+Rohannagariya1@users.noreply.github.com> Date: Tue, 4 Mar 2025 18:53:32 +0530 Subject: [PATCH 3/4] revert package json changes --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3663bc53..1cf5072e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "browserstack-local": "1.5.4", "chalk": "4.1.2", "cli-progress": "^3.10.0", - "decompress": "4.2.1", "form-data": "^4.0.0", "fs-extra": "8.1.0", "getmac": "5.20.0", @@ -27,16 +26,17 @@ "git-repo-info": "^2.1.1", "gitconfiglocal": "^2.1.0", "glob": "^7.2.0", - "mkdirp": "1.0.4", "mocha": "^10.2.0", + "mkdirp": "1.0.4", "node-ipc": "9.1.1", "table": "5.4.6", - "unzipper": "^0.12.3", "update-notifier": "7.0.0", - "uuid": "^8.3.2", + "uuid": "8.3.2", "windows-release": "^5.1.0", "winston": "2.4.4", - "yargs": "14.2.3" + "yargs": "14.2.3", + "decompress": "4.2.1", + "unzipper": "^0.12.3" }, "repository": { "type": "git", From af69bdebebc23f7dc4cc27ce070ce37d5f7dc6ce Mon Sep 17 00:00:00 2001 From: Rohan <142411639+Rohannagariya1@users.noreply.github.com> Date: Wed, 5 Mar 2025 11:30:13 +0530 Subject: [PATCH 4/4] changes after review --- bin/helpers/atsHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/helpers/atsHelper.js b/bin/helpers/atsHelper.js index 05db82fa..c612fff0 100644 --- a/bin/helpers/atsHelper.js +++ b/bin/helpers/atsHelper.js @@ -110,7 +110,7 @@ exports.patchCypressConfigFileContent = (bsConfig) => { let patchedConfPathList = confPath.split(path.sep); const uniqueNamePatchFileName = `patched_ats_config_file_${uuidv4()}.js`; patchedConfPathList[patchedConfPathList.length - 1] = uniqueNamePatchFileName; - logger.info("Patch file name is " + uniqueNamePatchFileName); + logger.debug("Patch file name is " + uniqueNamePatchFileName); const patchedConfPath = patchedConfPathList.join(path.sep); bsConfig.run_settings.patched_cypress_config_file = patchedConfPath;