C20250516 (#154)

* updates to tests and allure

* mav1080

* Merge remote-tracking branch 'origin/main' into C20250516

Author: chinmaymudholkar1

libs/__init__.py

@@ -10,24 +10,24 @@
 class CurrentExecution:
     page = None
     browser = None
-    service_url: str | None = ""
-    base_auth_username: str | None = ""
-    base_auth_password: str | None = ""
-    current_browser_name: str | None = ""
-    headless_mode: bool | None = False
-    session_screenshots_dir: str | None = ""
+    service_url: str = ""
+    base_auth_username: str = ""
+    base_auth_password: str = ""
+    current_browser_name: str = ""
+    headless_mode: bool = False
+    session_screenshots_dir: str = ""
 
-    capture_screenshot_flag: bool | None = False
-    nurse_username: str | None = ""
-    nurse_password: str | None = ""
-    superuser_username: str | None = ""
-    superuser_password: str | None = ""
-    admin_username: str | None = ""
-    admin_password: str | None = ""
-    reset_endpoint: str | None = ""
-    api_token: str | None = ""
-    reset_env_before_execution: bool | None = False
-    slow_motion: int | None = 0
+    capture_screenshot_flag: bool = False
+    nurse_username: str = ""
+    nurse_password: str = ""
+    superuser_username: str = ""
+    superuser_password: str = ""
+    admin_username: str = ""
+    admin_password: str = ""
+    reset_endpoint: str = ""
+    api_token: str = ""
+    reset_env_before_execution: bool = False
+    slow_motion: int = 0
 
     screenshot_sequence: int = 0
     child_list: list[str] = []
@@ -37,21 +37,27 @@ class CurrentExecution:
     @staticmethod
     def get_env_values():
         load_dotenv()
-        CurrentExecution.service_url = os.getenv("BASE_URL")
-        CurrentExecution.base_auth_username = os.getenv("BASIC_AUTH_USERNAME")
-        CurrentExecution.base_auth_password = os.getenv("BASIC_AUTH_PASSWORD")
-        CurrentExecution.nurse_username = os.getenv("NURSE_USERNAME")
-        CurrentExecution.nurse_password = os.getenv("NURSE_PASSWORD")
-        CurrentExecution.superuser_username = os.getenv("SUPERUSER_USERNAME")
-        CurrentExecution.superuser_password = os.getenv("SUPERUSER_PASSWORD")
-        CurrentExecution.admin_username = os.getenv("ADMIN_USERNAME")
-        CurrentExecution.admin_password = os.getenv("ADMIN_PASSWORD")
-        CurrentExecution.headless_mode = os.getenv("HEADLESS", "True").lower() == "true"
-        CurrentExecution.capture_screenshot_flag = os.getenv("CAPTURE_SCREENSHOTS", "True").lower() == "true"
-        CurrentExecution.reset_endpoint = f"{CurrentExecution.service_url}{os.getenv('RESET_ENDPOINT')}"
-        CurrentExecution.api_token = os.getenv("API_TOKEN")
-        CurrentExecution.reset_env_before_execution = os.getenv("RESET_ENV_BEFORE_EXECUTION", "True").lower() == "true"
-        CurrentExecution.slow_motion = int(os.getenv("SLOW_MOTION", 0))
+        CurrentExecution.service_url = CurrentExecution.get_env_value(var_name="BASE_URL")
+        CurrentExecution.base_auth_username = CurrentExecution.get_env_value(var_name="BASIC_AUTH_USERNAME")
+        CurrentExecution.base_auth_password = CurrentExecution.get_env_value(var_name="BASIC_AUTH_PASSWORD")
+        CurrentExecution.nurse_username = CurrentExecution.get_env_value(var_name="NURSE_USERNAME")
+        CurrentExecution.nurse_password = CurrentExecution.get_env_value(var_name="NURSE_PASSWORD")
+        CurrentExecution.superuser_username = CurrentExecution.get_env_value(var_name="SUPERUSER_USERNAME")
+        CurrentExecution.superuser_password = CurrentExecution.get_env_value(var_name="SUPERUSER_PASSWORD")
+        CurrentExecution.admin_username = CurrentExecution.get_env_value(var_name="ADMIN_USERNAME")
+        CurrentExecution.admin_password = CurrentExecution.get_env_value(var_name="ADMIN_PASSWORD")
+        CurrentExecution.headless_mode = CurrentExecution.get_env_value(var_name="HEADLESS").lower() == "true"
+        CurrentExecution.capture_screenshot_flag = (
+            CurrentExecution.get_env_value(var_name="CAPTURE_SCREENSHOTS").lower() == "true"
+        )
+        CurrentExecution.reset_endpoint = (
+            f"{CurrentExecution.service_url}{CurrentExecution.get_env_value(var_name='RESET_ENDPOINT')}"
+        )
+        CurrentExecution.api_token = CurrentExecution.get_env_value(var_name="API_TOKEN")
+        CurrentExecution.reset_env_before_execution = (
+            CurrentExecution.get_env_value(var_name="RESET_ENV_BEFORE_EXECUTION").lower() == "true"
+        )
+        CurrentExecution.slow_motion = int(CurrentExecution.get_env_value(var_name="SLOW_MOTION"))
 
     @staticmethod
     def reset_environment():
@@ -84,3 +90,11 @@ def set_session_id(session_id: str):
     @staticmethod
     def get_session_id() -> str:
         return CurrentExecution.session_id
+
+    @staticmethod
+    def get_env_value(var_name: str) -> str:
+        _val = os.getenv(var_name)
+        if _val is None:
+            return ""
+        else:
+            return _val