Merge branch 'master' into issue_1415

manifest.json

@@ -3,7 +3,7 @@
   "name": "JDN",
   "description": "JDN – helps Test Automation Engineer to create Page Objects in the test automation framework and speed up test development",
   "devtools_page": "index.html",
-  "version": "3.13.538",
+  "version": "3.13.539",
   "icons": {
     "128": "icon128.png"
   },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jdn-ai-chrome-extension",
-  "version": "3.13.538",
+  "version": "3.13.539",
   "description": "jdn-ai chrome extension",
   "scripts": {
     "start": "webpack --watch --env devenv",

src/__tests__/__mocks__/pageObjectMocks/pageObject.mock.js

@@ -11,6 +11,7 @@ export const locators = [
       robulaXpath: "//*[@class='uui-navigation nav navbar-nav m-l8']",
       output: "//*[@class='uui-navigation nav navbar-nav m-l8']",
     },
+    annotationType: AnnotationType.UI,
     name: "listUl",
     predictedAttrId: "",
     predicted_label: "list",
@@ -32,6 +33,7 @@ export const locators = [
       robulaXpath: "//*[@class='footer-menu']",
       output: "//*[@class='footer-menu']",
     },
+    annotationType: AnnotationType.UI,
     name: "listUl7",
     predictedAttrId: "",
     predicted_label: "list",
@@ -52,6 +54,7 @@ export const locators = [
       output: "/html/body/div/div[1]/div/div[1]/div/div[1]/ul/li[1]/a",
       taskStatus: "REVOKED",
     },
+    annotationType: AnnotationType.UI,
     name: "badge",
     predictedAttrId: "",
     predicted_label: "badge",

src/features/pageObjects/utils/pageObjectTemplate.ts

@@ -2,7 +2,7 @@ import { ElementLibrary } from "../../locators/types/generationClasses.types";
 import { camelCase, upperFirst } from "lodash";
 import transliterate from "@sindresorhus/transliterate";
 import { Locator } from "../../locators/types/locator.types";
-import { AnnotationType } from "../../../common/types/common";
+import { getLocatorPrefix } from "../../locators/utils/locatorOutput";
 
 export const getClassName = (title: string) => {
   let className = transliterate(title);
@@ -20,7 +20,10 @@ export const pageObjectTemplate = (locators: Locator[], title: string, library:
   const className = title;
   const locatorsCode = locators.map((loc) => {
     const locatorEscaped = loc.locator.output?.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-    return `    ${AnnotationType.UI}("${locatorEscaped}")\n    public ${loc.type} ${loc.name};`;
+    return `    ${loc.annotationType}(${getLocatorPrefix(
+      loc.annotationType,
+      loc.locatorType
+    )}"${locatorEscaped}")\n    public ${loc.type} ${loc.name};`;
   });
 
   const pageCode = `package site.pages;