[master] - hot fix for getting resolution

Author: Denys Zaiats

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

@@ -98,25 +98,25 @@ private String getZoomScript() {
     }
 
     private long retrievePageHeight() {
-        if (!isAppiumAndroidContext()) {
+        if (!isAppiumContext()) {
             if (getZoom().equals("100%")) {
-                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;}");
+                return (long) executeScript("if (window.innerHeight) {return window.innerHeight;} if (document.documentElement && document.documentElement.clientHeight) {return document.documentElement.clientHeight;}if (document.body) {return document.body.clientHeight;}");
             } else {
                 return (long) executeScript("return document.getElementsByTagName('body')[0].offsetHeight");
             }
         } else {
             if (isAppiumNativeMobileContext() || isAppiumIOSContext()) {
                 return driver.manage().window().getSize().getHeight();
             } else {
-                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;}");
+                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;}");
             }
         }
     }
 
     private long retrievePageWidth() {
-        if (!isAppiumAndroidContext()) {
+        if (!isAppiumContext()) {
             if (getZoom().equals("100%")) {
-                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;}";
+                String script = "if (window.innerWidth) {return window.innerWidth;} if (document.documentElement && document.documentElement.clientWidth) {return document.documentElement.clientWidth;}if (document.body) {return document.body.clientWidth;}";
                 return (long) executeScript(script);
             } else {
                 return (long) executeScript("return document.getElementsByTagName('body')[0].offsetWidth");
@@ -125,7 +125,7 @@ private long retrievePageWidth() {
             if (isAppiumNativeMobileContext() || isAppiumIOSContext()) {
                 return driver.manage().window().getSize().getWidth();
             } else {
-                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;}");
+                return (long) executeScript("if (self.innerWidth) {return self.outerWidth;} if (document.documentElement && document.documentElement.clientWidth) {return document.documentElement.clientWidth;}if (document.body) {return document.body.clientWidth;}");
             }
         }
     }

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

@@ -30,6 +30,7 @@ public ResponsiveUIChunkValidatorBase(UISnapshot snapshot, List<WebElement> webE
             if (!getDriver().isAppiumContext()) {
                 try {
                     ((JavascriptExecutor) getDriver().getDriver()).executeScript("arguments[0].scrollIntoView();", webElements.get(0));
+                    ((JavascriptExecutor) getDriver().getDriver()).executeScript("javascript:window.scrollBy(0,250);");
                 } catch (Exception e) {}
             }
         }

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

@@ -39,6 +39,7 @@ public UIValidatorBase(UISnapshot snapshot, WebElement webElement, String readab
         if (!getDriver().isAppiumContext()) {
             try {
                 ((JavascriptExecutor) getDriver().getDriver()).executeScript("arguments[0].scrollIntoView();", webElement);
+                ((JavascriptExecutor) getDriver().getDriver()).executeScript("javascript:window.scrollBy(0,250);");
             } catch (Exception e) {}
         }
     }