mops 3.2.0__tar.gz → 3.2.1__tar.gz

{mops-3.2.0 → mops-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mops
-Version: 3.2.0
+Version: 3.2.1
 Summary: Wrapper of Selenium, Appium and Playwright with single API
 Author-email: Podolian Vladimir <vladimir.podolyan64@gmail.com>
 License: MIT

{mops-3.2.0 → mops-3.2.1}/mops/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '3.2.0'
+__version__ = '3.2.1'
 __project_name__ = 'mops'

{mops-3.2.0 → mops-3.2.1}/mops/js_scripts.py

@@ -46,7 +46,7 @@ function appendElement(given_obj) {
     const driverWrapperObj = document.createElement("div");
 
     driverWrapperObj.style.zIndex = 9999999;
-    driverWrapperObj.setAttribute("class", "driver-wrapper-comparison-support-element");
+    driverWrapperObj.setAttribute("class", "driver-wrapper-visual-comparison-support-element");
     driverWrapperObj.style.backgroundColor = "#000";
 
     // Determine position type based on scroll position

{mops-3.2.0 → mops-3.2.1}/mops/mixins/internal_mixin.py

@@ -3,19 +3,12 @@ from __future__ import annotations
 from functools import lru_cache
 from typing import Any
 
-from appium.webdriver.common.appiumby import AppiumBy
-
 from mops.utils.internal_utils import (
     get_child_elements_with_names,
-    get_child_elements,
     get_all_attributes_from_object,
 )
 
 
-all_locator_types = get_child_elements(AppiumBy, str)
-available_kwarg_keys = ('desktop', 'mobile', 'ios', 'android')
-
-
 def get_element_info(element: Any, label: str = 'Selector=') -> str:
     """
     Get element selector information with parent object selector if it exists

{mops-3.2.0 → mops-3.2.1}/mops/mixins/objects/locator_type.py

@@ -21,8 +21,22 @@ class LocatorType:
         For better readability, you can use this class with the following syntax:
 
         - :obj:`Element(f'{LocatorType.XPATH}=//*[@class="class-name"]')`
+        - :obj:`Element(f'{LocatorType.ANDROID_UIAUTOMATOR}=//*[@class="class-name"]')`
     """
     CSS: str = 'css'
     XPATH: str = 'xpath'
     ID: str = 'id'
     TEXT: str = 'text'
+
+    # Appium mobile native context
+    IOS_PREDICATE: str = '-ios predicate string'
+    IOS_UIAUTOMATION: str = '-ios uiautomation'
+    IOS_CLASS_CHAIN: str = '-ios class chain'
+    ANDROID_UIAUTOMATOR: str = '-android uiautomator'
+    ANDROID_VIEWTAG: str = '-android viewtag'
+    ANDROID_DATA_MATCHER: str = '-android datamatcher'
+    ANDROID_VIEW_MATCHER: str = '-android viewmatcher'
+    WINDOWS_UI_AUTOMATION: str = '-windows uiautomation'
+    ACCESSIBILITY_ID: str = 'accessibility id'
+    IMAGE: str = '-image'
+    CUSTOM: str = '-custom'

{mops-3.2.0 → mops-3.2.1}/mops/selenium/driver/web_driver.py

@@ -32,13 +32,16 @@ class WebDriver(CoreDriver):
         :param size: The desired inner window size as a :class:`.Size` object.
         :return: The current instance of :obj:`.WebDriver`.
         """
-        outer_width, outer_height = astuple(self.get_window_size())
-        inner_width, inner_height = astuple(self.get_inner_window_size())
+        width, height = astuple(size)
 
-        width_diff = outer_width - inner_width
-        height_diff = outer_height - inner_height
+        if self.is_desktop:
+            outer_width, outer_height = astuple(self.get_window_size())
+            inner_width, inner_height = astuple(self.get_inner_window_size())
 
-        self.driver.set_window_size(size.width + width_diff, size.height + height_diff)
+            width += outer_width - inner_width
+            height += outer_height - inner_height
+
+        self.driver.set_window_size(width, height)
         return self
 
     def get_all_tabs(self) -> List[str]:

{mops-3.2.0 → mops-3.2.1}/mops/utils/selector_synchronizer.py

@@ -15,6 +15,19 @@ DEFAULT_MATCH = (f"{LocatorType.XPATH}=", f"{LocatorType.ID}=", f"{LocatorType.C
 XPATH_MATCH = ("/", "./", "(/")
 CSS_MATCH = ("#", ".")
 CSS_REGEXP = r"[#.\[\]=]"
+APPIUM_LOCATOR_TYPES = (
+    f'{LocatorType.IOS_PREDICATE}=',
+    f'{LocatorType.IOS_UIAUTOMATION}=',
+    f'{LocatorType.IOS_CLASS_CHAIN}=',
+    f'{LocatorType.ANDROID_UIAUTOMATOR}=',
+    f'{LocatorType.ANDROID_VIEWTAG}=',
+    f'{LocatorType.ANDROID_DATA_MATCHER}=',
+    f'{LocatorType.ANDROID_VIEW_MATCHER}=',
+    f'{LocatorType.WINDOWS_UI_AUTOMATION}=',
+    f'{LocatorType.ACCESSIBILITY_ID}=',
+    f'{LocatorType.IMAGE}=',
+    f'{LocatorType.CUSTOM}=',
+)
 
 
 def get_platform_locator(obj: Any):
@@ -89,11 +102,6 @@ def set_selenium_selector(obj: Any):
         obj.locator_type = By.CSS_SELECTOR
         obj.log_locator = f'{LocatorType.CSS}={locator}'
 
-    elif " " in locator:
-        obj.locator = f'//*[contains(text(), "{locator}")]'
-        obj.locator_type = By.XPATH
-        obj.log_locator = f'{LocatorType.XPATH}={obj.locator}'
-
     # Default to ID if nothing else matches
 
     else:
@@ -127,9 +135,6 @@ def set_playwright_locator(obj: Any):
     elif locator in all_tags or all(tag in all_tags for tag in locator.split()):
         obj.locator_type = LocatorType.CSS
 
-    elif " " in locator:
-        obj.locator_type = LocatorType.TEXT
-
     # Default to ID if nothing else matches
 
     else:
@@ -147,8 +152,11 @@ def set_appium_selector(obj: Any):
 
     locator = obj.locator.strip()
 
-    # Mobile com.android selector
-
-    if ':id' in locator:
+    if ':id/' in locator:  # Mobile com.android selector
         obj.locator_type = By.CSS_SELECTOR
         obj.log_locator = f'{LocatorType.ID}={locator}'
+    elif locator.startswith(APPIUM_LOCATOR_TYPES):
+        partition = locator.partition('=')
+        obj.locator_type = partition[0]
+        obj.locator = partition[-1]
+        obj.log_locator = locator

{mops-3.2.0 → mops-3.2.1}/mops/visual_comparison.py

@@ -319,8 +319,8 @@ class VisualComparison:
             scaled_image = cv2.resize(output_image, (width, height))
             cv2.imwrite(diff_file, scaled_image)
             raise AssertionError(f"↓\nImage size (width, height) is not same for '{self.screenshot_name}':"
-                                 f"\nExpected: {reference_image.shape[0:2]};"
-                                 f"\nActual: {output_image.shape[0:2]}.") from None
+                                 f"\nExpected: {self._get_image_size_from_shape(reference_image.shape)};"
+                                 f"\nActual: {self._get_image_size_from_shape(output_image.shape)}.") from None
 
         diff, actual_threshold = self._get_difference(reference_image, output_image, threshold)
         is_different = actual_threshold > threshold
@@ -503,3 +503,12 @@ class VisualComparison:
         :return: test_screenshot__data___name -> test_screenshot_data_name
         """
         return re.sub(r'_{2,}', '_', text)
+
+    def _get_image_size_from_shape(self, shape: tuple) -> tuple:
+        """
+        Get image size (width, height) from shape
+
+        :param shape: shape tuple from numpy.ndarray
+        :return: (width, height)
+        """
+        return shape[1], shape[0]

{mops-3.2.0 → mops-3.2.1}/mops.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mops
-Version: 3.2.0
+Version: 3.2.1
 Summary: Wrapper of Selenium, Appium and Playwright with single API
 Author-email: Podolian Vladimir <vladimir.podolyan64@gmail.com>
 License: MIT