REFACTOR: device platform-processing to be more lazy

yashaka · Oct 24, 2024 · 047376d · 047376d
1 parent a6b1bd4
commit 047376d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015-2022 Iakiv Kramarenko
+Copyright (c) 2015 Iakiv Kramarenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/examples/run_cross_platform_android_ios/README.md b/examples/run_cross_platform_android_ios/README.md
@@ -0,0 +1 @@
+See more complete example with full configuration management and pageobjects at [python-mobile-test-template](https://github.com/automician/python-mobile-test-template)
diff --git a/selene/support/_mobile/context.py b/selene/support/_mobile/context.py
@@ -119,25 +119,21 @@ def element(
             return Element(selector_or_by_or_locator, self.config)
 
         # TODO: should not we apply translation in a more lazy way, based on config?
-        bys_per_platform = {
-            'android': self.config._selector_or_by_to_by(
-                selector_or_by_per_platform.get(
-                    'android',
-                    selector_or_by_per_platform.get('drd', selector_or_by_or_locator),
-                )
-            ),
-            'ios': self.config._selector_or_by_to_by(
-                selector_or_by_per_platform.get('ios', selector_or_by_or_locator)
+        selector_or_by_per_platform = {
+            'android': selector_or_by_per_platform.get(
+                'android',
+                selector_or_by_per_platform.get('drd', selector_or_by_or_locator),
             ),
+            'ios': selector_or_by_per_platform.get('ios', selector_or_by_or_locator),
         }
 
         # todo: do we need by_to_locator_strategy?
         return Element(
             PlatformWiseByLocator(
                 lambda by: f'{self}.element({by})',
-                bys_per_platform=bys_per_platform,
-                config=self.config,
                 search=lambda by: self.driver.find_element(*by),
+                selector_or_by_platform=selector_or_by_per_platform,
+                config=self.config,
             ),
             self.config,
         )
@@ -168,24 +164,21 @@ def all(
             return AllElements(selector_or_by_or_locator, self.config)
 
         # TODO: should not we apply translation in a more lazy way, based on config?
-        bys_per_platform = {
-            'android': self.config._selector_or_by_to_by(
-                selector_or_by_per_platform.get(
-                    'android',
-                    selector_or_by_per_platform.get('drd', selector_or_by_or_locator),
-                )
-            ),
-            'ios': self.config._selector_or_by_to_by(
-                selector_or_by_per_platform.get('ios', selector_or_by_or_locator)
+        selector_or_by_per_platform = {
+            'android': selector_or_by_per_platform.get(
+                'android',
+                selector_or_by_per_platform.get('drd', selector_or_by_or_locator),
             ),
+            'ios': selector_or_by_per_platform.get('ios', selector_or_by_or_locator),
         }
 
+        # todo: do we need by_to_locator_strategy?
         return AllElements(
             PlatformWiseByLocator(
                 lambda by: f'{self}.all({by})',
-                bys_per_platform=bys_per_platform,
-                config=self.config,
                 search=lambda by: self.driver.find_elements(*by),
+                selector_or_by_platform=selector_or_by_per_platform,
+                config=self.config,
             ),
             self.config,
         )

diff --git a/selene/support/_mobile/locators.py b/selene/support/_mobile/locators.py
@@ -96,18 +96,24 @@ def __init__(
         description: Callable[[Tuple[str, str]], str],
         *,
         search: Callable,
-        bys_per_platform,
+        selector_or_by_platform,
         config: Config,
     ):
         self._config = config
-        self._bys_per_platform = bys_per_platform
+        self._bys_per_platform = selector_or_by_platform
 
         def locate():
-            by = bys_per_platform.get(self._current_platform_name)
+            by = config._selector_or_by_to_by(
+                selector_or_by_platform.get(self._current_platform_name)
+            )
             return search(by) if by is not None else cast(T, _SkippedAppiumElement())
 
         super().__init__(
-            lambda: description(bys_per_platform.get(self._current_platform_name)),
+            lambda: description(
+                config._selector_or_by_to_by(
+                    selector_or_by_platform.get(self._current_platform_name)
+                )
+            ),
             locate,
         )