Fix is mobile checking

Author: eirenik0

eyes_selenium/applitools/selenium/eyes_selenium_utils.py

@@ -101,6 +101,10 @@
 
 
 def is_mobile_platform(driver):
+    # type: (AnyWebDriver) -> bool
+    """
+    Returns whether the platform running is a mobile browser or app.
+    """
     driver = get_underlying_driver(driver)
     if isinstance(driver, AppiumWebDriver):
         return True
@@ -110,43 +114,27 @@ def is_mobile_platform(driver):
 def is_mobile_web(driver):
     # type: (AnyWebDriver) -> bool
     """
-    Returns whether the platform running is a mobile device or not.
-
-    :return: True if the platform running the test is a mobile platform. False otherwise.
-    """
-    is_mobile_script = """
-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;
-}
+    Returns whether the platform running is a mobile browser.
     """
     # if driver is selenium based
     platform_name = driver.desired_capabilities.get("platformName", "").lower()
-    # platformName sometime have different names
+    browser_name = driver.desired_capabilities.get("browserName", "").lower()
     is_mobile = "android" in platform_name or "ios" in platform_name
-    if not is_mobile:
-        try:
-            is_mobile = driver.execute_script(is_mobile_script)
-        except WebDriverException as e:
-            logger.warning(
-                "Got error during checking if current platform is mobile web. "
-                "\n\t {}".format(str(e))
-            )
-            is_mobile = False
-    return is_mobile
+    if is_mobile and browser_name:
+        return True
+    return False
 
 
 def is_mobile_app(driver):
-    # TODO: check with hybrid mobile apps
+    # type: (AnyWebDriver) -> bool
+    """
+    Returns whether the platform running is a mobile app.
+    """
     platform_name = driver.desired_capabilities.get("platformName", "").lower()
-    # platformName sometime have different names
-    is_mobile = "android" in platform_name or "ios" in platform_name
+    browser_name = driver.desired_capabilities.get("browserName", "").lower()
     app = driver.desired_capabilities.get("app", None)
-    if is_mobile and app:
+    is_mobile = "android" in platform_name or "ios" in platform_name
+    if is_mobile and app and not browser_name:
         return True
     return False
 

eyes_selenium/applitools/selenium/selenium_eyes.py

@@ -243,7 +243,7 @@ def check(self, name, check_settings=None):
         )
         self._original_frame_chain = self.driver.frame_chain.clone()
 
-        if not self.driver.is_mobile_web:
+        if not self.driver.is_mobile_platform:
             # hide scrollbar for main window
             self._try_hide_scrollbars()
 
@@ -525,7 +525,7 @@ def _environment(self):
             logger.info("No OS set, checking for mobile OS...")
             # Since in Python Appium driver is the same for Android and iOS,
             # we need to use the desired capabilities to figure this out.
-            if self._driver.is_mobile_platform:
+            if eyes_selenium_utils.is_mobile_platform(self._driver):
                 platform_name = self._driver.platform_name
                 logger.info(platform_name + " detected")
                 platform_version = self._driver.platform_version

tests/unit/eyes_selenium/test_eyes_selenium_utils.py

@@ -21,15 +21,28 @@
 )
 def test_different_mobile_platform_names(driver_mock, platform_name):
     driver_mock.desired_capabilities["platformName"] = platform_name
+    driver_mock.desired_capabilities["browserName"] = "someBrowser"
     assert eyes_selenium_utils.is_mobile_web(driver_mock)
+    assert not eyes_selenium_utils.is_mobile_app(driver_mock)
 
 
 @pytest.mark.parametrize("platform_name", ["Windows", "Winmo", "Linux", "macOs"])
 def test_different_not_mobile_platform_names(driver_mock, platform_name):
     driver_mock.desired_capabilities["platformName"] = platform_name
+    driver_mock.desired_capabilities["browserName"] = "someBrowser"
     assert not eyes_selenium_utils.is_mobile_web(driver_mock)
+    assert not eyes_selenium_utils.is_mobile_app(driver_mock)
+    assert not eyes_selenium_utils.is_mobile_platform(driver_mock)
 
 
 def test_appium_webdriver(driver_mock):
     driver_mock._driver = mock.Mock(AppiumWebDriver)
-    assert eyes_selenium_utils.is_mobile_web(driver_mock)
+    assert eyes_selenium_utils.is_mobile_platform(driver_mock)
+
+
+@pytest.mark.parametrize("platform_name", ["Android", "ios 11"])
+def test_using_mobile_app(driver_mock, platform_name):
+    driver_mock.desired_capabilities["app"] = "some_app"
+    driver_mock.desired_capabilities["platformName"] = platform_name
+    assert eyes_selenium_utils.is_mobile_app(driver_mock)
+    assert not eyes_selenium_utils.is_mobile_web(driver_mock)