Skip to content

Commit 099ab1f

Browse files
author
Denys Zaiats
committed
[update_dependencies] - changed inner to outer in the getting of measurements
1 parent 4448bdc commit 099ab1f

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/main/java/net/itarray/automotion/internal/DriverFacade.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,23 @@ private String getZoomScript() {
100100
private long retrievePageHeight() {
101101
if (!isAppiumAndroidContext()) {
102102
if (getZoom().equals("100%")) {
103-
return (long) executeScript("if (self.innerHeight) {return self.innerHeight;} if (document.documentElement && document.documentElement.clientHeight) {return document.documentElement.clientHeight;}if (document.body) {return document.body.clientHeight;}");
103+
return (long) executeScript("if (self.outerHeight) {return self.outerHeight;} if (document.documentElement && document.documentElement.clientHeight) {return document.documentElement.clientHeight;}if (document.body) {return document.body.clientHeight;}");
104104
} else {
105105
return (long) executeScript("return document.getElementsByTagName('body')[0].offsetHeight");
106106
}
107107
} else {
108108
if (isAppiumNativeMobileContext() || isAppiumIOSContext()) {
109109
return driver.manage().window().getSize().getHeight();
110110
} else {
111-
return (long) executeScript("if (self.innerHeight) {return self.innerHeight;} if (document.documentElement && document.documentElement.clientHeight) {return document.documentElement.clientHeight;}if (document.body) {return document.body.clientHeight;}");
111+
return (long) executeScript("if (self.outerHeight) {return self.outerHeight;} if (document.documentElement && document.documentElement.clientHeight) {return document.documentElement.clientHeight;}if (document.body) {return document.body.clientHeight;}");
112112
}
113113
}
114114
}
115115

116116
private long retrievePageWidth() {
117117
if (!isAppiumAndroidContext()) {
118118
if (getZoom().equals("100%")) {
119-
String script = "if (self.innerWidth) {return self.innerWidth;} if (document.documentElement && document.documentElement.clientWidth) {return document.documentElement.clientWidth;}if (document.body) {return document.body.clientWidth;}";
119+
String script = "if (self.outerWidth) {return self.outerWidth;} if (document.documentElement && document.documentElement.clientWidth) {return document.documentElement.clientWidth;}if (document.body) {return document.body.clientWidth;}";
120120
return (long) executeScript(script);
121121
} else {
122122
return (long) executeScript("return document.getElementsByTagName('body')[0].offsetWidth");
@@ -125,7 +125,7 @@ private long retrievePageWidth() {
125125
if (isAppiumNativeMobileContext() || isAppiumIOSContext()) {
126126
return driver.manage().window().getSize().getWidth();
127127
} else {
128-
return (long) executeScript("if (self.innerWidth) {return self.innerWidth;} if (document.documentElement && document.documentElement.clientWidth) {return document.documentElement.clientWidth;}if (document.body) {return document.body.clientWidth;}");
128+
return (long) executeScript("if (self.outerWidth) {return self.outerWidth;} if (document.documentElement && document.documentElement.clientWidth) {return document.documentElement.clientWidth;}if (document.body) {return document.body.clientWidth;}");
129129
}
130130
}
131131
}

src/main/java/net/itarray/automotion/internal/ResponsiveUIChunkValidatorBase.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
import net.itarray.automotion.validation.UISnapshot;
66
import net.itarray.automotion.validation.Units;
77
import org.json.simple.JSONObject;
8+
import org.openqa.selenium.JavascriptExecutor;
89
import org.openqa.selenium.WebElement;
910
import util.validator.ResponsiveUIValidator;
1011

1112
import java.util.List;
1213
import java.util.Map;
1314
import java.util.SortedMap;
1415
import java.util.TreeMap;
15-
import java.util.concurrent.ConcurrentSkipListMap;
16-
import java.util.concurrent.atomic.AtomicLong;
1716

1817
import static net.itarray.automotion.internal.UIElement.*;
1918

@@ -27,6 +26,12 @@ public ResponsiveUIChunkValidatorBase(UISnapshot snapshot, List<WebElement> webE
2726
if (webElements.isEmpty()) {
2827
String message = "Set root web element";
2928
addError(message);
29+
} else {
30+
if (!getDriver().isAppiumContext()) {
31+
try {
32+
((JavascriptExecutor) getDriver().getDriver()).executeScript("arguments[0].scrollIntoView();", webElements.get(0));
33+
} catch (Exception e) {}
34+
}
3035
}
3136
}
3237

0 commit comments

Comments
 (0)