Merge pull request #78 from AutomateThePlanet/navramov_MM

Add Mobile Properties

Author: n1xan

bellatrix.ios/src/main/java/solutions/bellatrix/ios/configuration/IOSSettings.java

@@ -38,6 +38,7 @@ public class IOSSettings {
     @Getter @Setter private String defaultIOSVersion;
     @Getter @Setter private Boolean downloadDemoApps;
     @Getter @Setter private String serviceUrl;
+    @Getter @Setter private String deviceIdentifier;
 
     @Getter @Setter private List<GridSettings> gridSettings;
 

bellatrix.ios/src/main/java/solutions/bellatrix/ios/configuration/TimeoutSettings.java

@@ -21,6 +21,7 @@ public class TimeoutSettings {
     @Getter @Setter private long elementWaitTimeout;
     @Getter @Setter private long sleepInterval;
     @Getter @Setter private long validationsTimeout;
+    @Getter @Setter private long webviewConnectTimeout;
     @Getter @Setter private long elementToBeVisibleTimeout;
     @Getter @Setter private long elementToExistTimeout;
     @Getter @Setter private long elementToNotExistTimeout;

bellatrix.ios/src/main/java/solutions/bellatrix/ios/infrastructure/DriverService.java

@@ -89,6 +89,8 @@ private static IOSDriver initializeDriverGridMode(GridSettings gridSettings) {
         caps.setAutomationName(AutomationName.IOS_XCUI_TEST);
         caps.setPlatformVersion(getAppConfiguration().getIosVersion());
         caps.setDeviceName(getAppConfiguration().getDeviceName());
+        caps.setUdid(ConfigurationService.get(IOSSettings.class).getDeviceIdentifier());
+        caps.setWebviewConnectTimeout(Duration.ofSeconds(ConfigurationService.get(IOSSettings.class).getTimeoutSettings().getWebviewConnectTimeout()));
 
         try {
             var driver = new IOSDriver(new URL(gridSettings.getUrl()), caps);

framework-tests/bellatrix.ios.tests/src/main/resources/testFrameworkSettings.dev.json

@@ -9,6 +9,7 @@
     "defaultDeviceName": "iPhone 6",
     "defaultIosVersion": "11.3",
     "defaultBrowser": "Safari",
+    "deviceIdentifier": "4005808588763",
     "defaultAppPath": "${user.home}/TestApp.app.zip",
     "artificialDelayBeforeAction": "0",
     "automaticallyScrollToVisible": "false",
@@ -22,6 +23,7 @@
       "elementWaitTimeout": "30",
       "sleepInterval": "1",
       "waitForPartialUrl": "30",
+      "webviewConnectTimeout": 60,
       "validationsTimeout": "30",
       "elementToBeVisibleTimeout": "30",
       "elementToExistTimeout": "30",

framework-tests/bellatrix.ios.tests/src/main/resources/testFrameworkSettings.qa.json

@@ -9,6 +9,7 @@
     "defaultDeviceName": "iPhone 6",
     "defaultIosVersion": "11.3",
     "defaultBrowser": "Safari",
+    "deviceIdentifier": "4005808588763",
     "defaultAppPath": "${user.home}/TestApp.app.zip",
     "artificialDelayBeforeAction": "0",
     "automaticallyScrollToVisible": "false",
@@ -21,6 +22,7 @@
       "implicitWaitTimeout": "5",
       "elementWaitTimeout": "30",
       "sleepInterval": "1",
+      "webviewConnectTimeout": 60,
       "waitForPartialUrl": "30",
       "validationsTimeout": "30",
       "elementToBeVisibleTimeout": "30",