fix: add /b escaping and remove redundant escaping when download

jdi-testing · May 6, 2024 · 567d32e · 567d32e
1 parent 9cd164d
commit 567d32e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/features/locators/utils/escapeLocatorString.ts b/src/features/locators/utils/escapeLocatorString.ts
@@ -7,6 +7,7 @@ export const fullEscapeLocatorString = (str: string = ''): string => {
     .replaceAll(/\\/g, '\\\\') // escape backslash
     .replaceAll(/\"/g, '\\"') // escape double quotes
     .replaceAll(/\'/g, "\\'") // escape single quotes
+    .replaceAll(/\b/g, '\\b') // escape backspaces
     .replaceAll(/\t/g, '\\t') // escape tabs
     .replaceAll(/\n/g, '\\n') // escape newlines
     .replaceAll(/\r/g, '\\r') // escape carriage returns

diff --git a/src/features/pageObjects/utils/pageObjectTemplate.ts b/src/features/pageObjects/utils/pageObjectTemplate.ts
@@ -49,13 +49,13 @@ export const getPageObjectTemplateForJdi = (
   const { name: className, library } = pageObject;
 
   const locatorsCode = locators.map((locator) => {
-    const locatorEscaped = locator.locatorValue.output?.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+    const locatorOutput = locator.locatorValue.output;
     const { locatorType } = pageObject;
     const currentLocatorType = locator.locatorType || locatorType || LocatorType.xPath;
     return `    ${locator.annotationType}(${getLocatorPrefix(
       locator.annotationType,
       currentLocatorType,
-    )}"${locatorEscaped}")\n    public ${locator.type} ${locator.name};`;
+    )}"${locatorOutput}")\n    public ${locator.type} ${locator.name};`;
   });
 
   const hasFindByAnnotationType: boolean = hasAnnotationType(locators, AnnotationType.FindBy);