[master] - fixes for mobile test run

Author: Denys Zaiats

src/main/java/net/itarray/automotion/tools/driver/CapabilitiesFactory.java

@@ -33,61 +33,61 @@ public static DesiredCapabilities getCapabilities() {
     public static DesiredCapabilities updateCapabilities(DesiredCapabilities desiredCapabilities, Map<String, Object> mapCapabilities) {
         if (mapCapabilities.size() > 0) {
             for (Map.Entry<String, Object> capability : mapCapabilities.entrySet()) {
-                desiredCapabilities.setCapability(capability.getKey(), capability.getValue());
+                setCapability(capability.getKey(), capability.getValue());
             }
         }
 
         return desiredCapabilities;
     }
 
     private static DesiredCapabilities getCommonMobileCapabilities() {
-        capabilities.setCapability("automationName", getAutomationName());
-        capabilities.setCapability("platformVersion", getPlatformVersion());
-        capabilities.setCapability("deviceName", getDevice());
-        capabilities.setCapability("deviceOrientation", "portrait");
-        capabilities.setCapability("app", getApp());
-        capabilities.setCapability("browserName", getMobileBrowser());
-        capabilities.setCapability("appiumVersion", getAppiumVersion());
-        capabilities.setCapability("name", getName());
-        capabilities.setCapability("newCommandTimeout", getNewCommandTimeout());
+        setCapability("automationName", getAutomationName());
+        setCapability("platformVersion", getPlatformVersion());
+        setCapability("deviceName", getDevice());
+        setCapability("deviceOrientation", "portrait");
+        setCapability("app", getApp());
+        setCapability("browserName", getMobileBrowser());
+        setCapability("appiumVersion", getAppiumVersion());
+        setCapability("name", getName());
+        setCapability("newCommandTimeout", getNewCommandTimeout());
 
         return capabilities;
     }
 
     private static DesiredCapabilities getAndroidCapabilities() {
         capabilities = getCommonMobileCapabilities();
-        capabilities.setCapability("platformName", "Android");
-        capabilities.setCapability("appActivity", getAppActivity());
-        capabilities.setCapability("appPackage", getAppPackage());
+        setCapability("platformName", "Android");
+        setCapability("appActivity", getAppActivity());
+        setCapability("appPackage", getAppPackage());
 
         return capabilities;
     }
 
     private static DesiredCapabilities getIOSCapabilities() {
         capabilities = getCommonMobileCapabilities();
-        capabilities.setCapability("platformName", "iOS");
-        capabilities.setCapability("udid", getUDIDDevice());
-        capabilities.setCapability("waitForAppScript", "true");
+        setCapability("platformName", "iOS");
+        setCapability("udid", getUDIDDevice());
+        setCapability("waitForAppScript", "true");
 
         return capabilities;
     }
 
     private static DesiredCapabilities getWindowsCapabilities() {
         capabilities = getCommonMobileCapabilities();
-        capabilities.setCapability("platformName", "Windows");
+        setCapability("platformName", "Windows");
 
         return capabilities;
     }
 
     private static DesiredCapabilities getPhantomJSCapabilities() {
         capabilities.setJavascriptEnabled(true);
-        capabilities.setCapability("takesScreenshot", true);
-        capabilities.setCapability("browserName", "PhantomJS");
-        capabilities.setCapability("browser", "phantomjs");
-        capabilities.setCapability("phantomjs.page.settings.userAgent", getUserAgent());
-        capabilities.setCapability("acceptSslCerts", true);
-        capabilities.setCapability(PhantomJSDriverService.PHANTOMJS_CLI_ARGS, new String[] {"--web-security=no", "--ignore-ssl-errors=yes","--ignore-ssl-errors=true","--ssl-protocol=tlsv1"});
-        capabilities.setCapability(PhantomJSDriverService.PHANTOMJS_EXECUTABLE_PATH_PROPERTY,
+        setCapability("takesScreenshot", true);
+        setCapability("browserName", "PhantomJS");
+        setCapability("browser", "phantomjs");
+        setCapability("phantomjs.page.settings.userAgent", getUserAgent());
+        setCapability("acceptSslCerts", true);
+        setCapability(PhantomJSDriverService.PHANTOMJS_CLI_ARGS, new String[] {"--web-security=no", "--ignore-ssl-errors=yes","--ignore-ssl-errors=true","--ssl-protocol=tlsv1"});
+        setCapability(PhantomJSDriverService.PHANTOMJS_EXECUTABLE_PATH_PROPERTY,
                 getPhantomJsPath()
         );
 
@@ -116,15 +116,21 @@ private static DesiredCapabilities getRemoteDriverCapabilities() {
             chromeOptions.put("args", Arrays.asList("enable-extensions",
                     "test-type", "no-default-browser-check", "ignore-certificate-errors"));
 
-            capabilities.setCapability(ChromeOptions.CAPABILITY, chromeOptions);
+            setCapability(ChromeOptions.CAPABILITY, chromeOptions);
         }
 
         if (getSlDesktopPlatform() != null) {
-            capabilities.setCapability("platform", getSlDesktopPlatform());
-            capabilities.setCapability("version", getSlBrowserVersion());
-            capabilities.setCapability("screenResolution", getSlDesktopResolution());
+            setCapability("platform", getSlDesktopPlatform());
+            setCapability("version", getSlBrowserVersion());
+            setCapability("screenResolution", getSlDesktopResolution());
         }
 
         return capabilities;
     }
+    
+    private static void setCapability(String key, Object value) {
+        if (value != null) {
+            capabilities.setCapability(key, value);
+        }
+    }
 }

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

@@ -10,6 +10,8 @@
 import java.io.File;
 import java.util.List;
 
+import static net.itarray.automotion.tools.environment.EnvironmentFactory.isMobile;
+
 public class UISnapshot {
 
     private final ResponsiveUIValidator responsiveUIValidator;
@@ -23,8 +25,10 @@ public UISnapshot(ResponsiveUIValidator responsiveUIValidator, String name, Reso
         this.name = name;
         this.resolution = resolution.queryIfUnknown(responsiveUIValidator.driver);
         this.zoom = zoom.queryIfUnknown(responsiveUIValidator.driver);
-        resolution.applyTo(responsiveUIValidator.driver);
-        zoom.applyTo(responsiveUIValidator.driver);
+        if (!isMobile()) {
+            resolution.applyTo(responsiveUIValidator.driver);
+            zoom.applyTo(responsiveUIValidator.driver);
+        }
     }
 
     public String getName() {