Merge branch 'master' into GridAlignment

Author: dzaiats

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

@@ -4,6 +4,9 @@
 import io.appium.java_client.android.AndroidDriver;
 import io.appium.java_client.ios.IOSDriver;
 import org.openqa.selenium.*;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.phantomjs.PhantomJSDriver;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
 import java.io.File;
@@ -39,6 +42,18 @@ public WebDriver getDriver() {
         return driver;
     }
 
+    public boolean isChromeDriver() {
+        return (driver instanceof ChromeDriver) || ((RemoteWebDriver) driver).getCapabilities().getBrowserName().toLowerCase().equals("chrome");
+    }
+
+    public boolean isFirefoxDriver() {
+        return (driver instanceof FirefoxDriver) || ((RemoteWebDriver) driver).getCapabilities().getBrowserName().toLowerCase().equals("firefox");
+    }
+
+    public boolean isPhantomJSDriver() {
+        return (driver instanceof PhantomJSDriver);
+    }
+
     public boolean isAppiumAndroidContext() {
         return driver instanceof AndroidDriver;
     }
@@ -92,7 +107,7 @@ private String getZoomScript() {
     private long retrievePageHeight() {
         if (!isAppiumContext()) {
             if (getZoom().equals("100%")) {
-                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;}");
+                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;}");
             } else {
                 return (long) executeScript("return document.getElementsByTagName('body')[0].offsetHeight");
             }
@@ -108,7 +123,7 @@ private long retrievePageHeight() {
     private long retrievePageWidth() {
         if (!isAppiumContext()) {
             if (getZoom().equals("100%")) {
-                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;}";
+                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;}";
                 return (long) executeScript(script);
             } else {
                 return (long) executeScript("return document.getElementsByTagName('body')[0].offsetWidth");
@@ -117,7 +132,7 @@ private long retrievePageWidth() {
             if (isAppiumNativeMobileContext() || isAppiumIOSContext()) {
                 return driver.manage().window().getSize().getWidth();
             } else {
-                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;}");
+                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;}");
             }
         }
     }

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

@@ -114,23 +114,25 @@ private Html buildHtml() throws IOException, ParseException {
                                 new NoTag(this, String.format("Time execution: %s", jsonObject.get(TIME_EXECUTION)));
                             }};
 
-                            new H5(this,
-                                    new Style("color: #4d4d4d")) {{
-                                new NoTag(this, "Hover over the image to see the results");
-                            }};
+                            //TODO uncomment after implementing the hovering events
+//                            new H5(this,
+//                                    new Style("color: #4d4d4d")) {{
+//                                new NoTag(this, "Hover over the image to see the results");
+//                            }};
                             new P(this) {{
                                 screenshotDrawingOverlay = jsonObject.get(DRAWINGS);
                                 new Div(this,
-                                                new OnMouseOver("document.getElementById('" + screenshotDrawingOverlay.toString()+ "').style.display = 'block'"),
-                                                new OnMouseOut("document.getElementById('" + screenshotDrawingOverlay.toString()+ "').style.display = 'none'"),
+                                                //new OnMouseOver("document.getElementById('" + screenshotDrawingOverlay.toString()+ "').style.display = 'block'"),
+                                                //new OnMouseOut("document.getElementById('" + screenshotDrawingOverlay.toString()+ "').style.display = 'none'"),
                                                 new Style("position:relative; left: 0; top:0; width: 96%; margin-left:2%")) {{
                                             new Img(this,
                                                     new Style("position:relative; left: 0; top:0"),
                                                 new Src(String.format("img/%s", jsonObject.get(SCREENSHOT))),
                                                 new Alt("screenshot"));
                                             new Img(this,
                                                 new Id(screenshotDrawingOverlay.toString()),
-                                                new Style("position:absolute; left: 0; top:0; display:none;"),
+                                                new Style("position:absolute; left: 0; top:0;"),
+                                                //new Style("position:absolute; left: 0; top:0; display:none;"),
                                                 new Src(String.format("img/%s", screenshotDrawingOverlay)),
                                                 new Alt("screenshot-overlay"));
                                         }};

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

@@ -109,16 +109,17 @@ private SimpleTransform getTransform() {
     }
 
     private double getScaleFactor() {
-//        double factor;
-//        if (getDriver().isAppiumContext()) {
-//            factor = getReport().getRetinaScaleFactor();
-//        } else {
-//            factor = zoomFactor;
-//            if (isChrome()) {
-//                factor = factor * 2;
-//            }
-//        }
-        return getReport().getRetinaScaleFactor();
+        double factor;
+        if (getDriver().isAppiumContext()) {
+            factor = getReport().getRetinaScaleFactor();
+        } else {
+            factor = zoomFactor;
+            if (getDriver().isChromeDriver()) {
+                factor = factor * getReport().getRetinaScaleFactor();
+            }
+        }
+
+        return factor;
     }
 
     private int getYOffset() {