Skip to content
This repository was archived by the owner on Mar 19, 2021. It is now read-only.

Commit e706cf8

Browse files
author
Serhii Khalymon
committed
Fix is_mobile_device handling
1 parent 1f9c1d8 commit e706cf8

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

applitools/selenium/eyes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def _ensure_viewport_size(self):
280280
if self._viewport_size is None:
281281
self._viewport_size = self._driver.get_default_content_viewport_size()
282282
if not eyes_selenium_utils.is_mobile_device(self._driver):
283-
self.set_viewport_size(self._driver, self._viewport_size)
283+
eyes_selenium_utils.set_viewport_size(self._driver, self._viewport_size)
284284

285285
def open(self, driver, app_name, test_name, viewport_size=None):
286286
# type: (AnyWebDriver, tp.Text, tp.Text, tp.Optional[ViewPort]) -> EyesWebDriver

applitools/selenium/eyes_selenium_utils.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,22 @@ def is_mobile_device(driver):
8080
8181
:return: True if the platform running the test is a mobile platform. False otherwise.
8282
"""
83+
is_mobile = """
84+
if( navigator.userAgent.match(/Android/i) ||
85+
navigator.userAgent.match(/iPhone/i) ||
86+
navigator.userAgent.match(/iPad/i) ||
87+
navigator.userAgent.match(/iPod/i) ) {
88+
return true;
89+
} else {
90+
return false;
91+
}
92+
"""
93+
# TODO: Implement proper UserAgent handling
8394
driver = get_underlying_driver(driver)
84-
return driver.desired_capabilities.get('platformName') in ('Android', 'iOS')
95+
is_mobile_platform = driver.desired_capabilities.get('platformName') in ('Android', 'iOS')
96+
if not is_mobile_platform:
97+
is_mobile_platform = driver.execute_script(is_mobile)
98+
return is_mobile_platform
8599

86100

87101
def get_underlying_driver(driver):

0 commit comments

Comments
 (0)