chore(e2e_mobile): appium config for BrowserStack and Jenkins

Author: glitchminer

test/e2e_appium/config/environments/base.yaml

@@ -27,13 +27,11 @@ timeouts:
 
 logging:
   level: "INFO"
-  enable_screenshots: true
-  enable_video_recording: true
   enable_xml_report: true
   enable_html_report: true
   enable_junit_report: true
 
 directories:
-  logs: "logs"
-  reports: "reports"
-  screenshots: "screenshots"
+  reports: "reports/${E2E_RUN_ID:-local}"
+  logs: "reports/${E2E_RUN_ID:-local}/logs"
+  screenshots: "reports/${E2E_RUN_ID:-local}/screenshots"

test/e2e_appium/config/environments/browserstack.yaml

@@ -13,10 +13,10 @@ provider:
     auth:
       username: "${BROWSERSTACK_USERNAME:-}"
       access_key: "${BROWSERSTACK_ACCESS_KEY:-}"
-    build_name_template: "Status_E2E_Mobile"
+    build_name_template: "${BROWSERSTACK_BUILD_NAME:-${BROWSERSTACK_BUILD_IDENTIFIER:-${GIT_COMMIT:-Status Mobile}}}"
     build_identifier_template: "${BROWSERSTACK_BUILD_IDENTIFIER:-${GIT_COMMIT:-local}}"
-    session_name_template: "${TEST_NAME:-Status Test}"
-    project_name: "Status E2E Appium"
+    session_name_template: "${TEST_NAME:-${PYTEST_CURRENT_TEST:-Status Test}}"
+    project_name: "${BROWSERSTACK_PROJECT_NAME:-Status E2E Appium}"
     hub_url: "https://hub-cloud.browserstack.com/wd/hub"
     max_parallel_sessions: 5
     sdk:
@@ -29,7 +29,13 @@ device_defaults:
     newCommandTimeout: 300
     bstack:options:
       deviceOrientation: "landscape"
-      "appiumVersion" : "2.19.0"
+      "appiumVersion": "2.19.0"
+      video: true
+      debug: false
+      networkLogs: false
+      appiumLogs: true
+      deviceLogs: true
+      appProfiling: false
     orientation: "LANDSCAPE"
     appium:unicodeKeyboard: true
     appium:resetKeyboard: true
@@ -76,7 +82,5 @@ execution:
 
 logging:
   level: "INFO"
-  enable_video_recording: true
-  enable_screenshots: true
   enable_xml_report: true
   enable_html_report: true

test/e2e_appium/config/environments/local.yaml

@@ -53,9 +53,4 @@ timeouts:
 
 logging:
   level: "DEBUG"
-  enable_video_recording: false
 
-directories:
-  logs: "logs/local"
-  reports: "reports/local"
-  screenshots: "screenshots/local"

test/e2e_appium/config/logging_config.py

@@ -247,9 +247,9 @@ def setup_logging(config: Optional[LoggingConfig] = None) -> Dict[str, Any]:
     if config is None:
         config = LoggingConfig()
 
-    # Create logs directory
+    # Create logs directory (create parents for nested per-run paths)
     logs_dir = Path(config.logs_dir)
-    logs_dir.mkdir(exist_ok=True)
+    logs_dir.mkdir(parents=True, exist_ok=True)
 
     # Clear any existing handlers
     root_logger = logging.getLogger()

test/e2e_appium/config/settings.py

@@ -1,7 +1,9 @@
 import os
 from dataclasses import dataclass, field
+from datetime import datetime
 from pathlib import Path
 from typing import Any, Dict, List, Optional
+from uuid import uuid4
 
 from core.config_manager import ConfigurationManager, EnvironmentSwitcher
 from core.environment import DeviceConfig, EnvironmentConfig
@@ -23,6 +25,7 @@ class TestConfig:
     logging_level: str
     concurrency: Dict[str, int]
     pytest_addopts: List[str]
+    run_id: str
     provider_options: Dict[str, Any] = field(default_factory=dict)
 
     @property
@@ -45,6 +48,15 @@ def platform_version(self) -> str:
 _CONFIG_CACHE: Optional[TestConfig] = None
 
 
+def _ensure_run_id() -> str:
+    run_id = os.getenv("E2E_RUN_ID")
+    if run_id:
+        return run_id
+    generated = f"local-{datetime.utcnow().strftime('%Y%m%d-%H%M%S')}-{uuid4().hex[:6]}"
+    os.environ["E2E_RUN_ID"] = generated
+    return generated
+
+
 def _select_device(env_config: EnvironmentConfig) -> DeviceConfig:
     device_id = os.getenv("TEST_DEVICE_ID")
     tag_env = os.getenv("TEST_DEVICE_TAGS", "")
@@ -77,6 +89,7 @@ def _ensure_directories(*paths: str) -> None:
 
 
 def load_config() -> TestConfig:
+    run_id = _ensure_run_id()
     env_name = os.getenv("TEST_ENVIRONMENT")
     manager = ConfigurationManager()
     if not env_name:
@@ -89,9 +102,15 @@ def load_config() -> TestConfig:
         env_config.device_defaults.get("capabilities", {})
     )
 
-    reports_dir = env_config.directories.get("reports", "reports")
-    logs_dir = env_config.directories.get("logs", "logs")
-    screenshots_dir = env_config.directories.get("screenshots", "screenshots")
+    reports_dir = env_config.resolve_template(
+        env_config.directories.get("reports", "reports")
+    )
+    logs_dir = env_config.resolve_template(
+        env_config.directories.get("logs", "logs")
+    )
+    screenshots_dir = env_config.resolve_template(
+        env_config.directories.get("screenshots", "screenshots")
+    )
     _ensure_directories(reports_dir, logs_dir, screenshots_dir)
 
     execution = env_config.execution or {}
@@ -114,6 +133,7 @@ def load_config() -> TestConfig:
         logging_level=logging_config.get("level", "INFO"),
         concurrency=env_config.concurrency_limits(),
         pytest_addopts=pytest_addopts,
+        run_id=run_id,
         provider_options=env_config.provider.options,
     )
     return config

test/e2e_appium/conftest.py

@@ -4,9 +4,8 @@
 from pathlib import Path
 from typing import List
 
-from .config import setup_logging, log_test_start, log_test_end
-from .config.logging_config import get_logger
-from .core import EnvironmentSwitcher
+from .config import get_config, setup_logging, log_test_start, log_test_end
+from .config.logging_config import get_logger, LoggingConfig
 from .utils.cloud_reporter import CloudResultReporter
 from .utils.screenshot import save_screenshot, save_page_source
 
@@ -23,45 +22,52 @@
 
 def pytest_configure(config):
     global _logging_setup
-    _logging_setup = setup_logging()
 
     # Normalize CLI --env to CURRENT_TEST_ENVIRONMENT so all components agree
     try:
         cli_env = getattr(config.option, "env", None)
         if cli_env:
             os.environ["CURRENT_TEST_ENVIRONMENT"] = cli_env
+            os.environ["TEST_ENVIRONMENT"] = cli_env
     except Exception:
         # Do not block test runs if normalization fails
         pass
 
-    # Use YAML-based configuration
-    switcher = EnvironmentSwitcher()
-    env_name = (
-        os.getenv("CURRENT_TEST_ENVIRONMENT") or switcher.auto_detect_environment()
-    )
-
     try:
-        env_config = switcher.switch_to(env_name)
+        config_obj = get_config(refresh=True)
 
-        # Use directories from YAML config
-        reports_dir = Path(env_config.directories.get("reports", "reports"))
-        enable_xml_report = env_config.logging.get("enable_xml_report", True)
-        enable_html_report = env_config.logging.get("enable_html_report", True)
+        reports_dir = Path(config_obj.reports_dir)
+        logs_dir = Path(config_obj.logs_dir)
+        enable_xml_report = config_obj.enable_xml_report
+        enable_html_report = config_obj.enable_html_report
+
+        logging_cfg = LoggingConfig(
+            logs_dir=str(logs_dir),
+            console_level=config_obj.logging_level,
+            file_level=config_obj.logging_level,
+        )
+        _logging_setup = setup_logging(logging_cfg)
 
         logger = get_logger("conftest")
-        logger.info("Using reports directory from %s config: %s", env_name, reports_dir)
+        logger.info(
+            "Using reports directory from %s config: %s",
+            config_obj.environment_name,
+            reports_dir,
+        )
 
     except Exception as e:
         # Simplified fallback using defaults
         reports_dir = Path("reports")
         enable_xml_report = True
         enable_html_report = True
 
+        _logging_setup = setup_logging()
+
         logger = get_logger("conftest")
         logger.warning("Using default configuration: %s", e)
         logger.warning("Ensure YAML config files are properly set up")
 
-    reports_dir.mkdir(exist_ok=True)
+    reports_dir.mkdir(parents=True, exist_ok=True)
 
     timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
 
@@ -178,16 +184,9 @@ def pytest_runtest_makereport(item, call):
             if driver:
                 # Resolve screenshots directory from environment config; fallback to 'screenshots'
                 try:
-                    env_switcher = EnvironmentSwitcher()
-                    env_name = (
-                        os.getenv("CURRENT_TEST_ENVIRONMENT")
-                        or env_switcher.auto_detect_environment()
-                    )
-                    env_config = env_switcher.switch_to(env_name)
-                    screenshots_dir = env_config.directories.get(
-                        "screenshots", "screenshots"
-                    )
-                    logs_dir = env_config.directories.get("logs", "logs")
+                    config_obj = get_config()
+                    screenshots_dir = config_obj.screenshots_dir or "screenshots"
+                    logs_dir = config_obj.logs_dir or "logs"
                 except Exception:
                     screenshots_dir = "screenshots"
                     logs_dir = "logs"

test/e2e_appium/core/providers/browserstack.py

@@ -29,9 +29,13 @@ def __init__(self, env_config):
                 "and BROWSERSTACK_ACCESS_KEY."
             )
         self.hub_url = env_config.get_provider_option("hub_url", self.HUB_URL)
-        self.project_name = env_config.get_provider_option(
+        project_name_option = env_config.get_provider_option(
             "project_name", "Status E2E Appium"
         )
+        if isinstance(project_name_option, str):
+            self.project_name = env_config.resolve_template(project_name_option)
+        else:
+            self.project_name = project_name_option
         self.sdk_options = env_config.get_provider_option("sdk", {})
 
     def create_driver(

test/e2e_appium/core/test_context.py

@@ -8,10 +8,10 @@
 from appium.webdriver.webdriver import WebDriver
 
 from core.session_manager import SessionManager
-from core.config_manager import EnvironmentSwitcher
 from pages.onboarding import HomePage
 from pages.app import App
 from utils.exceptions import SessionManagementError
+from config import get_config
 from config.logging_config import get_logger
 from utils.gestures import Gestures
 from utils.screenshot import save_screenshot
@@ -180,9 +180,8 @@ def driver(self) -> WebDriver:
 
     def take_screenshot(self, name: Optional[str] = None) -> Optional[str]:
         try:
-            switcher = EnvironmentSwitcher()
-            env_config = switcher.switch_to(self.environment)
-            base_dir = env_config.directories.get("screenshots", "screenshots")
+            config = get_config()
+            base_dir = config.screenshots_dir or "screenshots"
         except Exception:
             base_dir = "screenshots"
         try:

test/e2e_appium/fixtures/onboarding_fixture.py

@@ -7,6 +7,7 @@
 """
 
 from dataclasses import dataclass, field
+from pathlib import Path
 from typing import Optional, Dict, Any
 import pytest
 import time
@@ -23,6 +24,7 @@
 )
 from utils.generators import generate_seed_phrase
 from models.user_model import User, UserProfile
+from config import get_config
 from config.logging_config import get_logger
 
 
@@ -67,6 +69,16 @@ def __init__(self, driver, config: OnboardingConfig = None, logger=None):
         self.config = config or OnboardingConfig()
         self.logger = logger or get_logger("onboarding_flow")
 
+        if self.config.take_screenshots and not self.config.screenshot_path:
+            try:
+                resolved_dir = get_config().screenshots_dir
+                if resolved_dir:
+                    Path(resolved_dir).mkdir(parents=True, exist_ok=True)
+                    self.config.screenshot_path = resolved_dir
+            except Exception:
+                # Leave as None if config unavailable
+                pass
+
         # Initialize page objects
         self.welcome_page = WelcomePage(self.driver)
         self.analytics_page = AnalyticsPage(self.driver)
@@ -362,12 +374,20 @@ def _execute_main_app_verification(self):
 
     def _take_screenshot(self, name: str):
         """Take screenshot during flow execution"""
-        if self.config.screenshot_path:
+        try:
+            base_dir = self.config.screenshot_path
+            if not base_dir:
+                base_dir = get_config().screenshots_dir
+        except Exception:
+            base_dir = None
+
+        if base_dir:
             try:
+                Path(base_dir).mkdir(parents=True, exist_ok=True)
                 timestamp = datetime.now().strftime("%H%M%S")
                 screenshot_name = f"{name}_{timestamp}.png"
-                screenshot_path = f"{self.config.screenshot_path}/{screenshot_name}"
-                self.driver.save_screenshot(screenshot_path)
+                screenshot_path = Path(base_dir) / screenshot_name
+                self.driver.save_screenshot(str(screenshot_path))
                 self.logger.debug(f"📷 Screenshot saved: {screenshot_path}")
             except Exception as e:
                 self.logger.warning(f"⚠️ Failed to take screenshot '{name}': {e}")

test/e2e_appium/pages/base_page.py

@@ -1,15 +1,14 @@
 import time
-import os
 import logging
 from datetime import datetime
+from pathlib import Path
 from typing import Optional, List
 
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 
-from config import log_element_action
-from core import EnvironmentSwitcher
+from config import get_config, log_element_action
 from utils.gestures import Gestures
 from utils.screenshot import save_screenshot, save_page_source
 from utils.app_lifecycle_manager import AppLifecycleManager
@@ -23,16 +22,16 @@ def __init__(self, driver):
         self.gestures = Gestures(driver)
         self.app_lifecycle = AppLifecycleManager(driver)
         self.keyboard = KeyboardManager(driver)
-        env_name = os.getenv("CURRENT_TEST_ENVIRONMENT", "browserstack")
-
         try:
-            switcher = EnvironmentSwitcher()
-            env_config = switcher.switch_to(env_name)
-            self.timeouts = env_config.timeouts
-            element_wait_timeout = self.timeouts["element_wait"]
-            self._screenshots_dir = env_config.directories.get(
-                "screenshots", "screenshots"
-            )
+            config = get_config()
+            self.timeouts = config.environment.timeouts
+            element_wait_timeout = self.timeouts.get("element_wait", 30)
+            self._screenshots_dir = config.screenshots_dir or "screenshots"
+            try:
+                Path(self._screenshots_dir).mkdir(parents=True, exist_ok=True)
+            except Exception:
+                # Do not block tests if directory creation fails
+                pass
         except Exception:
             self.timeouts = {
                 "element_wait": 30,