refactoring bellatrix.servicenow

EliNedyalkova · EliNedyalkova · commit 8129fc291688 · 2025-08-11T11:52:35.000+03:00
update getting-started\bellatrix.servicenow
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/serviceNow/SnDate.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/serviceNow/SnDate.java
@@ -28,7 +28,7 @@ public String getText() {
     }
 
     public void setText(LocalDate localDate) {
-        var dateTimeFormat = calendarButton().getAttribute("models-date_time_format");
+        var dateTimeFormat = calendarButton().getAttribute("data-date_time_format");
         var dateAsString = DateTimeFormatter.ofPattern(dateTimeFormat).format(localDate);
 
         setText(dateAsString);
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/serviceNow/SnDateTime.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/serviceNow/SnDateTime.java
@@ -28,7 +28,7 @@ public String getText() {
     }
 
     public void setText(LocalDateTime localDateTime) {
-        var dateTimeFormat = calendarButton().getAttribute("models-date_time_format");
+        var dateTimeFormat = calendarButton().getAttribute("data-date_time_format");
         var dateAsString = DateTimeFormatter.ofPattern(dateTimeFormat).format(localDateTime);
 
         setText(dateAsString);
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/serviceNow/SnDefaultComponent.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/serviceNow/SnDefaultComponent.java
@@ -110,7 +110,7 @@ public void validateIsDisabled(boolean isDisabled) {
     }
 
     public String getType() {
-        var xpathLocator = ".//div[@models-type='label']";
+        var xpathLocator = ".//div[@data-type='label']";
         return this.createByXPath(Span.class, xpathLocator).getWrappedElement().getAttribute("type");
     }
 
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/serviceNow/SnGlideTime.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/serviceNow/SnGlideTime.java
@@ -28,7 +28,7 @@ public String getText() {
     }
 
     public void setText(LocalDateTime localDateTime) {
-        var dateTimeFormat = calendarButton().getAttribute("models-date_time_format");
+        var dateTimeFormat = calendarButton().getAttribute("data-date_time_format");
         var dateAsString = DateTimeFormatter.ofPattern(dateTimeFormat).format(localDateTime);
 
         setText(dateAsString);
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/uiBuilder/UIBDefaultComponent.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/components/uiBuilder/UIBDefaultComponent.java
@@ -118,7 +118,7 @@ public void validateIsDisabled(boolean isDisabled) {
     }
 
     public String getType() {
-        var xpathLocator = ".//div[@models-type='label']";
+        var xpathLocator = ".//div[@data-type='label']";
         return this.createByXPath(Span.class, xpathLocator).getWrappedElement().getAttribute("type");
     }
 
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/infrastructure/core/repositories/CurlLoggingFilter.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/infrastructure/core/repositories/CurlLoggingFilter.java
@@ -37,7 +37,7 @@ private List<String> generateCurl(FilterableRequestSpecification requestSpec) {
             curlParts.add("--header '%s: %s' \\".formatted(header.getName(), header.getValue()));
         }
         if (body != null && !body.isEmpty()) {
-            curlParts.add("--models '" + body.replace("'", "'\"'\"'") + "'");
+            curlParts.add("--data '" + body.replace("'", "'\"'\"'") + "'");
         }
         return curlParts;
     }
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/models/enums/SnFormFieldType.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/models/enums/SnFormFieldType.java
@@ -7,8 +7,8 @@
 
 public enum SnFormFieldType {
     INPUT("input", TextInput.class, "(//div[contains(@class,'form-group') and .//span[text()='%s']]//input[not(@type='hidden')])[1]"),
-    TEXTAREA("textarea", TextArea.class, "//div[@models-type='label' and .//span[text()='%s']]/following-sibling::div/textarea"),
-    SELECT("select", Select.class, "//div[@models-type='label' and .//span[text()='%s']]/following-sibling::div/select");
+    TEXTAREA("textarea", TextArea.class, "//div[@data-type='label' and .//span[text()='%s']]/following-sibling::div/textarea"),
+    SELECT("select", Select.class, "//div[@data-type='label' and .//span[text()='%s']]/following-sibling::div/select");
 
     private final String value;
     private final Class componentClass;
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/baseServiceNowRecordViewPage/Map.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/baseServiceNowRecordViewPage/Map.java
@@ -39,17 +39,17 @@ public Button selectFormInput(String element, String fieldName) {
     }
 
     public Select selectFormInput(String label) {
-        var locator = String.format("//div[@models-type='label' and .//span[text()='%s']]/following-sibling::div/select", label);
+        var locator = String.format("//div[@data-type='label' and .//span[text()='%s']]/following-sibling::div/select", label);
         return create().byXPath(Select.class, locator);
     }
 
     public Anchor cellByTableAndText(String tableName, String cellText) {
-        var locator = String.format("//caption[contains(@models-read-label,'%s')]//following-sibling::tbody[contains(@class,'list2_body')]//td/descendant-or-self::*[text()='%s']", tableName, cellText);
+        var locator = String.format("//caption[contains(@data-read-label,'%s')]//following-sibling::tbody[contains(@class,'list2_body')]//td/descendant-or-self::*[text()='%s']", tableName, cellText);
         return create().byXPath(Anchor.class, locator);
     }
 
     public Button buttonByTitle(String title) {
-        var xpath = String.format("//button[@models-original-title='%s']", title);
+        var xpath = String.format("//button[@data-original-title='%s']", title);
         return create().byXPath(Button.class, xpath);
     }
 
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/baseUiBuilderPage/Map.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/baseUiBuilderPage/Map.java
@@ -67,7 +67,7 @@ public Button selectButton(String label) {
     }
 
     public Button recordSaveButton() {
-        var xpathLocator = "(//div[./now-record-common-record-presence]//button[@models-ariadescribedby='Save'])[1]";
+        var xpathLocator = "(//div[./now-record-common-record-presence]//button[@data-ariadescribedby='Save'])[1]";
         return customUiMainMacroponent().createByXPath(Button.class, xpathLocator);
     }
 
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/sections/availableSelectPopUpSection/Map.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/sections/availableSelectPopUpSection/Map.java
@@ -16,6 +16,6 @@ public Button rolesOkButton() {
     }
 
     public Button arrowAddButton() {
-        return create().byXPath(Button.class, "//a[@models-original-title='Add']");
+        return create().byXPath(Button.class, "//a[@data-original-title='Add']");
     }
 }
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/sections/personalizeColumnSection/Map.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/sections/personalizeColumnSection/Map.java
@@ -22,11 +22,11 @@ public Button availableColumnByName(String name) {
     }
 
     public Anchor addArrowAnchor() {
-        return create().byXPath(Anchor.class, "//a[@models-original-title='Add']");
+        return create().byXPath(Anchor.class, "//a[@data-original-title='Add']");
     }
 
     public Anchor removeArrowAnchor() {
-        return create().byXPath(Anchor.class, "//a[@models-original-title='Remove']");
+        return create().byXPath(Anchor.class, "//a[@data-original-title='Remove']");
     }
 
     public Button okButton() {
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/serviceNowPage/Map.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/serviceNowPage/Map.java
@@ -61,7 +61,7 @@ public Anchor leftNavigatorElement(String section, String element) {
     }
 
     public Button leftNavigatorSubCategory(String section, String subCategory) {
-        String xpathLocator = String.format("//li[./a/span[text()='%s']]/ul//a//span[@models-tooltip-overflow-only-text and text()='%s']", section, subCategory);
+        String xpathLocator = String.format("//li[./a/span[text()='%s']]/ul//a//span[@data-tooltip-overflow-only-text and text()='%s']", section, subCategory);
         return create().byXPath(Button.class, xpathLocator);
     }
 
@@ -93,7 +93,7 @@ public Div polarisHomeTitle() {
     }
 
     public Button gearIcon() {
-        return create().byXPath(Button.class, "(//i[@models-title='Personalize List Columns'])[1]");
+        return create().byXPath(Button.class, "(//i[@data-title='Personalize List Columns'])[1]");
     }
 
     public Anchor polarisAllElementButton() {
@@ -144,11 +144,11 @@ public Button polarisAvatar() {
     }
 
     public Button polarisImpersonateUserAnchor() {
-        return polarisHeader().shadowRootCreateByCss(Button.class, "button[models-id='impersonateUser']");
+        return polarisHeader().shadowRootCreateByCss(Button.class, "button[data-id='impersonateUser']");
     }
 
     public Anchor polarisUnimpersonateUserAnchor() {
-        return polarisHeader().shadowRootCreateByCss(Anchor.class, "button[models-id='unimpersonate']");
+        return polarisHeader().shadowRootCreateByCss(Anchor.class, "button[data-id='unimpersonate']");
     }
 
     public Anchor polarisImpersonateButton() {
@@ -387,7 +387,7 @@ public WebComponent impersonationEndButtonShadowRoot() {
     }
 
     public Anchor polarisEndImpersonateUserAnchor() {
-        return polarisHeader().shadowRootCreateByCss(Anchor.class, "button[models-id='unimpersonate']>div[class='user-menu-label polaris-enabled']");
+        return polarisHeader().shadowRootCreateByCss(Anchor.class, "button[data-id='unimpersonate']>div[class='user-menu-label polaris-enabled']");
     }
 
     public Anchor polarisMenuItemChoice(String label) {
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/serviceNowTableViewPage/Map.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/pages/serviceNowTableViewPage/Map.java
@@ -11,7 +11,7 @@ public Anchor mainHeading() {
     }
 
     public Anchor contextManu() {
-        return create().byXPath(Anchor.class, "//a[@models-original-title='Properties Context Menu']");
+        return create().byXPath(Anchor.class, "//a[@data-original-title='Properties Context Menu']");
     }
 
     public Anchor recordNumberByRowCount(int rowCount) {
@@ -305,7 +305,7 @@ public Button menuView() {
     }
 
     public Button viewOption() {
-        var xpathLocator = "//div[@models-context-menu-label='View']";
+        var xpathLocator = "//div[@data-context-menu-label='View']";
         return create().byXPath(Button.class, xpathLocator);
     }
 
@@ -340,7 +340,7 @@ public Button expandAllButton() {
     }
 
     public Button viewAllAttachments() {
-        var xpathLocator = "//a[@models-original-title='View All Attachments']";
+        var xpathLocator = "//a[@data-original-title='View All Attachments']";
         return create().byXPath(Button.class, xpathLocator);
     }
 
@@ -359,7 +359,7 @@ public List<CheckBox> listSelectAttachments() {
         return create().allByXPath(CheckBox.class, xpathLocator);
     }
     public List<Div> tableHeadersByTabLabel(String tabLabel) {
-        var xpathLocator = String.format("//table[contains(@id,'REL') and ./caption[contains(@models-edit-label,'%s')]]//th[@name and not(@name='search')]", tabLabel);
+        var xpathLocator = String.format("//table[contains(@id,'REL') and ./caption[contains(@data-edit-label,'%s')]]//th[@name and not(@name='search')]", tabLabel);
         return create().allByXPath(Div.class, xpathLocator);
     }
 
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/plugins/fileuploads/fileWriterServices/FileWriterService.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/plugins/fileuploads/fileWriterServices/FileWriterService.java
@@ -37,7 +37,7 @@ public void writeToFileSystem(UploadedFile fileInfo) {
             Response fileUploadResponse = RestAssured
                 .given()
                 .header("Authorization", getAuthorizationHeaderValue())
-                .contentType("multipart/form-models")
+                .contentType("multipart/form-data")
                 .multiPart("files", fileInfo.getFile())
                 .when()
                 .post(apiUrl);
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/utilities/ReactComponentsScriptsFactory.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/utilities/ReactComponentsScriptsFactory.java
@@ -40,7 +40,7 @@ public static String generateGridAllVisibleDataScript() {
     }
 
     public static String generateGridAllVisibleDataScript(String instance) {
-        var command = String.format("let visibleRows = window.findReactComponent(arguments[0]).%s.getVisibleRows().filter(x => x.rowType == 'models');" +
+        var command = String.format("let visibleRows = window.findReactComponent(arguments[0]).%s.getVisibleRows().filter(x => x.rowType == 'data');" +
                 "let keys = visibleRows.map(x => x.cells.map(y => y.column.dataField))[0];" +
                 "let values = visibleRows.map(x => x.cells.map(y => y.column.dataType=='date' && y.text!==''?y.text:y.value));" +
                 "return JSON.stringify(result = values.map(v => {" +
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/utilities/UnzipUtility.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/utilities/UnzipUtility.java
@@ -10,7 +10,7 @@
 
 public class UnzipUtility {
     /**
-     * Size of the buffer to read/write models
+     * Size of the buffer to read/write data
      */
     private static final int BUFFER_SIZE = 4096;
     /**
diff --git a/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/utilities/UserInteraction.java b/bellatrix.servicenow/src/main/java/solutions/bellatrix/servicenow/utilities/UserInteraction.java
@@ -125,7 +125,7 @@ public static void waitUntilHeadersAppear() {
 
     public static void waitUntilStateIsComplete() throws InterruptedException {
         var app = new App();
-        var xpathLocator = "//div[@models-type='label' and .//span[text()='State']]/following-sibling::div/select";
+        var xpathLocator = "//div[@data-type='label' and .//span[text()='State']]/following-sibling::div/select";
         Wait.retry(() -> {
             if (!Objects.equals(app.create().byXPath(Select.class, xpathLocator).getSelected().getText(), "Completed")) {
                 throw new ElementStillExistException();

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public String getText() {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public void setText(LocalDate localDate) {`
`31`		`- var dateTimeFormat = calendarButton().getAttribute("models-date_time_format");`
	`31`	`+ var dateTimeFormat = calendarButton().getAttribute("data-date_time_format");`
`32`	`32`	`var dateAsString = DateTimeFormatter.ofPattern(dateTimeFormat).format(localDate);`
`33`	`33`
`34`	`34`	`setText(dateAsString);`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public void validateIsDisabled(boolean isDisabled) {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`public String getType() {`
`113`		`- var xpathLocator = ".//div[@models-type='label']";`
	`113`	`+ var xpathLocator = ".//div[@data-type='label']";`
`114`	`114`	`return this.createByXPath(Span.class, xpathLocator).getWrappedElement().getAttribute("type");`
`115`	`115`	`}`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public void validateIsDisabled(boolean isDisabled) {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`public String getType() {`
`121`		`- var xpathLocator = ".//div[@models-type='label']";`
	`121`	`+ var xpathLocator = ".//div[@data-type='label']";`
`122`	`122`	`return this.createByXPath(Span.class, xpathLocator).getWrappedElement().getAttribute("type");`
`123`	`123`	`}`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ private List<String> generateCurl(FilterableRequestSpecification requestSpec) {`
`37`	`37`	`curlParts.add("--header '%s: %s' \\".formatted(header.getName(), header.getValue()));`
`38`	`38`	`}`
`39`	`39`	`if (body != null && !body.isEmpty()) {`
`40`		`- curlParts.add("--models '" + body.replace("'", "'\"'\"'") + "'");`
	`40`	`+ curlParts.add("--data '" + body.replace("'", "'\"'\"'") + "'");`
`41`	`41`	`}`
`42`	`42`	`return curlParts;`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,17 +39,17 @@ public Button selectFormInput(String element, String fieldName) {`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public Select selectFormInput(String label) {`
`42`		`- var locator = String.format("//div[@models-type='label' and .//span[text()='%s']]/following-sibling::div/select", label);`
	`42`	`+ var locator = String.format("//div[@data-type='label' and .//span[text()='%s']]/following-sibling::div/select", label);`
`43`	`43`	`return create().byXPath(Select.class, locator);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public Anchor cellByTableAndText(String tableName, String cellText) {`
`47`		`- var locator = String.format("//caption[contains(@models-read-label,'%s')]//following-sibling::tbody[contains(@class,'list2_body')]//td/descendant-or-self::*[text()='%s']", tableName, cellText);`
	`47`	`+ var locator = String.format("//caption[contains(@data-read-label,'%s')]//following-sibling::tbody[contains(@class,'list2_body')]//td/descendant-or-self::*[text()='%s']", tableName, cellText);`
`48`	`48`	`return create().byXPath(Anchor.class, locator);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public Button buttonByTitle(String title) {`
`52`		`- var xpath = String.format("//button[@models-original-title='%s']", title);`
	`52`	`+ var xpath = String.format("//button[@data-original-title='%s']", title);`
`53`	`53`	`return create().byXPath(Button.class, xpath);`
`54`	`54`	`}`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public Button selectButton(String label) {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public Button recordSaveButton() {`
`70`		`- var xpathLocator = "(//div[./now-record-common-record-presence]//button[@models-ariadescribedby='Save'])[1]";`
	`70`	`+ var xpathLocator = "(//div[./now-record-common-record-presence]//button[@data-ariadescribedby='Save'])[1]";`
`71`	`71`	`return customUiMainMacroponent().createByXPath(Button.class, xpathLocator);`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ public Button rolesOkButton() {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public Button arrowAddButton() {`
`19`		`- return create().byXPath(Button.class, "//a[@models-original-title='Add']");`
	`19`	`+ return create().byXPath(Button.class, "//a[@data-original-title='Add']");`
`20`	`20`	`}`
`21`	`21`	`}`