Skip to content

Commit 4448bdc

Browse files
author
Denys Zaiats
committed
[update_dependencies] - updated configurations for mobile
1 parent 6e4c5b8 commit 4448bdc

File tree

5 files changed

+24
-18
lines changed

5 files changed

+24
-18
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.itarray</groupId>
88
<artifactId>automotion</artifactId>
9-
<version>2.0.4</version>
9+
<version>2.0.5</version>
1010
<name>Automotion</name>
1111
<description>Library for smart visual automation testing</description>
1212
<url>https://automotion.itarray.net</url>

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,15 @@ public Object executeScript(String script) {
7878
}
7979

8080
public String getZoom() {
81-
String zoom = (String) executeScript(getZoomScript());
82-
if (zoom == null || zoom.equals("")) {
83-
zoom = "100%";
81+
if (!isAppiumContext()) {
82+
String zoom = (String) executeScript(getZoomScript());
83+
if (zoom == null || zoom.equals("")) {
84+
zoom = "100%";
85+
}
86+
return zoom;
87+
} else {
88+
return "100%";
8489
}
85-
return zoom;
8690
}
8791

8892
private String getZoomScript() {
@@ -148,14 +152,16 @@ public Dimension getResolution() {
148152
}
149153

150154
public void setZoom(int percentage) {
151-
if (percentage <= 0) {
152-
throw new IllegalArgumentException(String.format("illegal zoom percentage %s - should be greater than zero", percentage));
153-
}
154-
JavascriptExecutor jse = (JavascriptExecutor) driver;
155-
if (isFirefox()) {
156-
jse.executeScript("document.body.style.MozTransform = 'scale(" + (percentage / 100f) + ")';");
157-
} else {
158-
jse.executeScript("document.body.style.zoom = '" + percentage + "%'");
155+
if (!isAppiumContext()) {
156+
if (percentage <= 0) {
157+
throw new IllegalArgumentException(String.format("illegal zoom percentage %s - should be greater than zero", percentage));
158+
}
159+
JavascriptExecutor jse = (JavascriptExecutor) driver;
160+
if (isFirefox()) {
161+
jse.executeScript("document.body.style.MozTransform = 'scale(" + (percentage / 100f) + ")';");
162+
} else {
163+
jse.executeScript("document.body.style.zoom = '" + percentage + "%'");
164+
}
159165
}
160166

161167
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class UIValidatorBase extends ResponsiveUIValidatorBase implements UIElem
3636
public UIValidatorBase(UISnapshot snapshot, WebElement webElement, String readableNameOfElement) {
3737
super(snapshot);
3838
this.rootElement = asElement(webElement, readableNameOfElement);
39-
if (getDriver().isAppiumContext()) {
39+
if (!getDriver().isAppiumContext()) {
4040
try {
4141
((JavascriptExecutor) getDriver().getDriver()).executeScript("arguments[0].scrollIntoView();", webElement);
4242
} catch (Exception e) {}

src/main/java/net/itarray/automotion/validation/UISnapshot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public UISnapshot(ResponsiveUIValidator responsiveUIValidator, String name, Reso
2323
this.name = name;
2424
this.resolution = resolution.queryIfUnknown(responsiveUIValidator.driver);
2525
this.zoom = zoom.queryIfUnknown(responsiveUIValidator.driver);
26-
if (responsiveUIValidator.getDriver().isAppiumContext()) {
26+
if (!responsiveUIValidator.getDriver().isAppiumContext()) {
2727
resolution.applyTo(responsiveUIValidator.driver);
2828
zoom.applyTo(responsiveUIValidator.driver);
2929
}

src/test/java/ResponsiveValidatorNewDSLTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import http.helpers.EnvironmentHelper;
1+
import net.itarray.automotion.tools.driver.WebDriverFactory;
2+
import net.itarray.automotion.tools.helpers.EnvironmentHelper;
23
import net.itarray.automotion.validation.ResponsiveUIValidator;
34
import net.itarray.automotion.validation.UISnapshot;
45
import net.itarray.automotion.validation.properties.Padding;
@@ -10,15 +11,14 @@
1011
import org.openqa.selenium.WebDriver;
1112
import org.openqa.selenium.WebElement;
1213
import org.openqa.selenium.phantomjs.PhantomJSDriverService;
13-
import util.driver.WebDriverFactory;
1414

1515
import java.awt.*;
1616
import java.util.HashMap;
1717
import java.util.Map;
1818

19+
import static net.itarray.automotion.internal.properties.PercentReference.PAGE;
1920
import static net.itarray.automotion.validation.properties.Condition.between;
2021
import static net.itarray.automotion.validation.properties.Expression.percent;
21-
import static net.itarray.automotion.internal.properties.PercentReference.PAGE;
2222
import static net.itarray.automotion.validation.properties.Zoom.zoom;
2323

2424
@Ignore

0 commit comments

Comments
 (0)