Skip to content

Commit b1ca345

Browse files
Updated to Seleniuim 4.39
1 parent 9675824 commit b1ca345

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ ext {
1818
core = project(':core')
1919
report = project(':report-ng')
2020

21-
seleniumVersion = '4.33.0'
21+
seleniumVersion = '4.39.0'
2222
// Must be the same like in Selenium 4
2323
// https://github.com/SeleniumHQ/selenium/blob/trunk/java/maven_install.json
24-
guavaVersion = "33.4.8-jre"
24+
guavaVersion = "33.5.0-jre"
2525

2626
moduleVersion = '2-SNAPSHOT'
2727
if (System.properties.containsKey('ttVersion')) {

driver-ui-desktop/src/main/java/eu/tsystems/mms/tic/testframework/pageobjects/location/ByImage.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,9 @@ public List<WebElement> findElements(SearchContext searchContext) {
104104
}
105105

106106
ScreenLocation center = imageRegion.getCenter();
107-
this.center.x = center.getX();
108-
this.center.y = center.getY();
107+
this.center = new Point(center.getX(), center.getY());
108+
// this.center.x = center.getX();
109+
// this.center.y = center.getY();
109110
driver.switchTo().defaultContent();
110111
WebElement webElement = WebDriverUtils.findElementByLocation(driver, this.center.x, this.center.y); // x and y are switched
111112

@@ -123,8 +124,12 @@ public List<WebElement> findElements(SearchContext searchContext) {
123124

124125
// calculate offset
125126
Point location = webElement.getLocation();
126-
this.center.x -= location.getX();
127-
this.center.y -= location.getY();
127+
this.center = new Point(
128+
this.center.x - location.getX(),
129+
this.center.y - location.getY()
130+
);
131+
// this.center.x -= location.getX();
132+
// this.center.y -= location.getY();
128133

129134
driver.switchTo().frame(webElement);
130135
webElement = WebDriverUtils.findElementByLocation(driver, this.center.x, this.center.y);

driver-ui-desktop/src/main/java/eu/tsystems/mms/tic/testframework/webdrivermanager/DesktopWebDriverFactory.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,21 +189,23 @@ public WebDriver setupNewWebDriverSession(WebDriver webDriver, SessionContext se
189189
Position maximizePosition = desktopWebDriverRequest.getMaximizePosition();
190190
if (maximizePosition != Position.CENTER) {
191191
log().debug(String.format("Setting maximized window position to: %s", maximizePosition));
192-
Point targetPosition = new Point(0, 0);
192+
int targetX = 0;
193+
int targetY = 0;
193194
switch (maximizePosition) {
194195
case LEFT:
195-
targetPosition.x = -originWindowSize.width;
196+
targetX = -originWindowSize.width;
196197
break;
197198
case RIGHT:
198-
targetPosition.x = window.getSize().width + 1;
199+
targetX = window.getSize().width + 1;
199200
break;
200201
case TOP:
201-
targetPosition.y = -originWindowSize.height;
202+
targetY = -originWindowSize.height;
202203
break;
203204
case BOTTOM:
204-
targetPosition.y = window.getSize().height + 1;
205+
targetY = window.getSize().height + 1;
205206
break;
206207
}
208+
Point targetPosition = new Point(targetX, targetY);
207209
log().debug(String.format("Move window to: %s", targetPosition));
208210
window.setPosition(targetPosition);
209211
// Re-maximize

driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/testing/SeleniumChromeDevTools.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import org.openqa.selenium.chrome.ChromeDriver;
3131
import org.openqa.selenium.devtools.DevTools;
3232
import org.openqa.selenium.devtools.HasDevTools;
33-
import org.openqa.selenium.devtools.v137.emulation.Emulation;
33+
import org.openqa.selenium.devtools.v143.emulation.Emulation;
3434
import org.openqa.selenium.remote.Augmenter;
3535
import org.openqa.selenium.remote.RemoteWebDriver;
3636

0 commit comments

Comments
 (0)