Fix is_mobile_device handling

Author: Serhii Khalymon

applitools/selenium/eyes.py

@@ -280,7 +280,7 @@ def _ensure_viewport_size(self):
         if self._viewport_size is None:
             self._viewport_size = self._driver.get_default_content_viewport_size()
             if not eyes_selenium_utils.is_mobile_device(self._driver):
-                self.set_viewport_size(self._driver, self._viewport_size)
+                eyes_selenium_utils.set_viewport_size(self._driver, self._viewport_size)
 
     def open(self, driver, app_name, test_name, viewport_size=None):
         # type: (AnyWebDriver, tp.Text, tp.Text, tp.Optional[ViewPort]) -> EyesWebDriver

applitools/selenium/eyes_selenium_utils.py

@@ -80,8 +80,22 @@ def is_mobile_device(driver):
 
     :return: True if the platform running the test is a mobile platform. False otherwise.
     """
+    is_mobile = """
+if( navigator.userAgent.match(/Android/i) ||
+    navigator.userAgent.match(/iPhone/i) ||
+    navigator.userAgent.match(/iPad/i)   ||
+    navigator.userAgent.match(/iPod/i) ) {
+    return true;
+} else {
+    return false;
+}
+    """
+    # TODO: Implement proper UserAgent handling
     driver = get_underlying_driver(driver)
-    return driver.desired_capabilities.get('platformName') in ('Android', 'iOS')
+    is_mobile_platform = driver.desired_capabilities.get('platformName') in ('Android', 'iOS')
+    if not is_mobile_platform:
+        is_mobile_platform = driver.execute_script(is_mobile)
+    return is_mobile_platform
 
 
 def get_underlying_driver(driver):

tests/platfroms.py

@@ -80,9 +80,9 @@ def full_name(self):
     Platform(name='Linux', version='', browsers=COMMON_BROWSERS, extra=None),
     Platform(name='macOS', version='10.13', browsers=COMMON_BROWSERS + [('safari', 'latest')], extra=None),
 
-    Platform(name='iPhone', version='11.3', browsers=[], extra={
+    Platform(name='iOS', version='11.3', browsers=[], extra={
         "appiumVersion":     "1.9.1",
-        "deviceName":        "Iphone Emulator",
+        "deviceName":        "iPhone Simulator",
         "deviceOrientation": "portrait",
         "browserName":       "Safari",
         "newCommandTimeout": 60 * 5

tests/selenium/test_appium.py

@@ -32,7 +32,7 @@ def test_final_application_android(eyes_open):
 
 
 @pytest.mark.mobile
-@pytest.mark.platform('iPhone')
+@pytest.mark.platform('iOS')
 @pytest.mark.parametrize('eyes', [
     {'force_full_page_screenshot': True, 'hide_scrollbars': False},
     {'force_full_page_screenshot': False, 'hide_scrollbars': False},

tox.ini

@@ -22,7 +22,7 @@ commands =
 basepython = python3.4
 commands =
     pytest -n 5 --platform="Android 6.0" --remote 1 tests/selenium/test_appium.py
-    pytest -n 2 --platform="iPhone 11.3" --remote 1 tests/selenium/test_appium.py
+;    pytest -n 2 --platform="iOS 11.3" --remote 1 tests/selenium/test_appium.py
 
 
 [testenv:lint]