fix qodana

Author: dmy.berezovskyi

conftest.py

@@ -62,10 +62,10 @@ def driver(request):
     except Exception as e:
         pytest.fail(f"Failed to initialize driver: {e}")
 
-    yield driver
+    yield event_driver
 
-    if driver is not None:
-        driver.quit()
+    if event_driver is not None:
+        event_driver.quit()
 
 
 # def pytest_runtest_makereport(item, call):

src/screens/base_screen.py

@@ -5,17 +5,15 @@
 
 
 Locator = Tuple[str, str]
+type Condition = Literal["clickable", "visible", "present"]
+type Direction = Literal["down", "up"]
 
 
 class Screen(ElementInteractor):
     def __init__(self, driver):
         super().__init__(driver)
 
-    def click(
-        self,
-        locator: Locator,
-        condition: Literal["clickable", "visible", "present"] = "clickable",
-    ):
+    def click(self, locator: Locator, condition: Condition = "clickable"):
         element = self.element(locator, condition=condition)
         element.click()
 
@@ -61,7 +59,7 @@ def swipe(
 
     def scroll(
         self,
-        directions: Literal["down", "up"] = "down",
+        directions: Direction = "down",
         start_ratio: float = 0.7,
         end_ratio: float = 0.3,
     ):
@@ -111,7 +109,7 @@ def scroll_to_element(
     def scroll_until_element_visible(
         self,
         destination_el: Locator,
-        directions: Literal["down", "up"] = "down",
+        directions: Direction = "down",
         start_ratio: float = 0.6,
         end_ratio: float = 0.3,
         retries: int = 1,
@@ -126,10 +124,7 @@ def type(self, locator: Locator, text: str):
         element.send_keys(text)
 
     def double_tap(
-        self,
-        locator: Locator,
-        condition: Literal["clickable", "visible", "present"] = "clickable",
-        **kwargs,
+        self, locator: Locator, condition: Condition = "clickable", **kwargs
     ):
         """Double taps on an element."""
         try:

src/screens/element_interactor.py

@@ -7,7 +7,7 @@
 from selenium.webdriver.common.actions.action_builder import ActionBuilder
 from selenium.webdriver.common.actions.pointer_input import PointerInput
 from selenium.webdriver.remote.webelement import WebElement
-from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support import expected_conditions as ec
 from selenium.webdriver.support.wait import WebDriverWait
 from selenium.common.exceptions import TimeoutException, NoSuchElementException
 
@@ -33,7 +33,7 @@ def __init__(self, driver):
         self.waiters[WaitType.FLUENT] = WebDriverWait(
             driver, WaitType.FLUENT.value, poll_frequency=1
         )
-    
+
     def _get_waiter(self, wait_type: Optional[WaitType] = None) -> WebDriverWait:
         """Returns the appropriate waiter based on the given wait_type."""
         return self.waiters.get(wait_type, self.waiters[WaitType.DEFAULT])
@@ -46,9 +46,9 @@ def wait_for(
     ) -> WebElement:
         waiter = waiter or self._get_waiter()
         conditions = {
-            "clickable": EC.element_to_be_clickable(locator),
-            "visible": EC.visibility_of_element_located(locator),
-            "present": EC.presence_of_element_located(locator),
+            "clickable": ec.element_to_be_clickable(locator),
+            "visible": ec.visibility_of_element_located(locator),
+            "present": ec.presence_of_element_located(locator),
         }
         if condition not in conditions:
             raise ValueError(f"Unknown condition: {condition}")

tests/test_p1/test_actions.py

@@ -2,7 +2,7 @@
 from screens.main_screen.main_screen import MainScreen
 
 
-class TestClick:
+class TestBaseActions:
     @pytest.fixture(autouse=True)
     def setup(self, driver) -> None:
         """Setup common objects for tests after address is set."""