refactor(tests): restructure into layered POM architecture with Allure reporting
- Split framework into core/ (config, logger, db, driver factories, screenshot, allure integration) and pages/ (PO layer: base/admin/driver); flatten test files per platform (web/admin, app/driver_android, cross_end) - Slim root conftest.py 656 -> ~100 lines: drop inline CN HTML report, add Allure severity mapping (p0/p1/p2 -> blocker/normal/minor) and environment.properties; support both tests.*-prefixed and bare imports - Preserve TC-D2S-001/002 cross-end E2E cases with business logic unchanged, add allure epic/feature/story/step annotations - Deduplicate: single makereport hook, shared failure-screenshot helpers, single SCREENSHOTS_DIR constant; deterministic auth-state role loading - Move DB credentials from db_helper.py into test_config.yaml (database section) - Move pytest.ini to repo root; switch reporting to allure-pytest (drop pytest-html/junitxml); update requirements.txt accordingly - Delete deprecated scaffolding: test_freight_full_flow + 6 stale page objects, iOS/shipper empty shells, dead utils - Fix flaky vxe-table action-row wait: wait for a visible td instead of hidden placeholder rows (fixed shipper-payment timeouts) - Verified end-to-end against live env: both E2E cases pass (2 passed 3m12s); run artifacts (logs/screenshots/allure) included per repo convention
This commit is contained in:
@@ -1,46 +0,0 @@
|
||||
"""配置加载器。
|
||||
|
||||
从 tests/config/test_config.yaml 读取配置,提供类型安全的访问接口。
|
||||
|
||||
Usage:
|
||||
from tests.config.test_config import load_config
|
||||
|
||||
config = load_config()
|
||||
admin_url = config["admin"]["base_url"]
|
||||
admin_phone = config["accounts"]["super_admin"]["phone"]
|
||||
|
||||
各端通过 fixture 直接引用对应 section:
|
||||
def test_xxx(admin_config):
|
||||
page.goto(admin_config["base_url"])
|
||||
"""
|
||||
|
||||
from pathlib import Path
|
||||
from typing import Any, Dict
|
||||
|
||||
import yaml
|
||||
|
||||
_CONFIG_PATH = Path(__file__).parent / "test_config.yaml"
|
||||
_cache: Dict[str, Any] | None = None
|
||||
|
||||
|
||||
def load_config(force_reload: bool = False) -> Dict[str, Any]:
|
||||
"""加载测试配置(带缓存,force_reload=True 可强制重载)。"""
|
||||
global _cache
|
||||
if _cache is not None and not force_reload:
|
||||
return _cache
|
||||
|
||||
if not _CONFIG_PATH.exists():
|
||||
raise FileNotFoundError(f"配置文件不存在: {_CONFIG_PATH}")
|
||||
|
||||
with open(_CONFIG_PATH, encoding="utf-8") as f:
|
||||
_cache = yaml.safe_load(f)
|
||||
|
||||
return _cache
|
||||
|
||||
|
||||
def get_config_section(section: str) -> Dict[str, Any]:
|
||||
"""获取配置中指定 section 的字典。"""
|
||||
config = load_config()
|
||||
if section not in config:
|
||||
raise KeyError(f"配置中不存在 section '{section}',可用: {list(config.keys())}")
|
||||
return config[section]
|
||||
@@ -1,11 +1,11 @@
|
||||
# 运八网络货运平台 — 测试环境配置
|
||||
# 数据来源: knowledge_base/00_project/project_profile.md
|
||||
# 使用方式: from tests.config.test_config import load_config
|
||||
# 使用方式: from tests.core.config_loader import load_config
|
||||
#
|
||||
# 覆盖端:
|
||||
# Web: 管理端 admin / 司机端小程序 mini_program
|
||||
# App: 司机安卓 driver_android / 货主安卓 shipper_android
|
||||
# 司机苹果 driver_ios / 货主苹果 shipper_ios
|
||||
# App: 司机安卓 driver_android
|
||||
# (预留: 货主安卓 shipper_android / 苹果端 driver_ios / shipper_ios)
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════════
|
||||
# ── 管理端 (Web/Playwright) ──
|
||||
@@ -113,7 +113,7 @@ shipper_ios:
|
||||
accounts:
|
||||
super_admin:
|
||||
phone: "super_admin"
|
||||
password: "951260684NiAn.."
|
||||
password: "951260684NiAi.."
|
||||
role: "平台运营人员"
|
||||
use_on: [admin]
|
||||
|
||||
@@ -136,9 +136,12 @@ accounts:
|
||||
use_on: [shipper_android, shipper_ios]
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════════
|
||||
# ── 报告 ──
|
||||
# ── 数据库 (tests/core/db_helper.py 使用) ──
|
||||
# ═══════════════════════════════════════════════════════════════════
|
||||
report:
|
||||
logs_dir: "output/logs"
|
||||
screenshots_dir: "output/screenshots"
|
||||
junit_xml: "output/reports/junit.xml"
|
||||
database:
|
||||
host: "36.137.133.24"
|
||||
port: 3306
|
||||
user: "ntocc"
|
||||
password: "Rgxi3!kD9jjXpgzx"
|
||||
database: "ntocc"
|
||||
charset: "utf8mb4"
|
||||
|
||||
Reference in New Issue
Block a user