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:
+23
-61
@@ -1,4 +1,4 @@
|
||||
"""管理端 fixture — Playwright 浏览器实例 + 登录态复用。
|
||||
"""管理端 fixtures — Playwright 浏览器实例 + 登录态复用。
|
||||
|
||||
核心机制:
|
||||
skip_login: true → 加载 storage_state,跳过验证码
|
||||
@@ -8,60 +8,38 @@
|
||||
python tests/web/admin/save_auth.py
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
from playwright.sync_api import sync_playwright, Page
|
||||
from playwright.sync_api import Page
|
||||
|
||||
SCREENSHOTS_DIR = Path("output/screenshots")
|
||||
from tests.core.playwright_support import (
|
||||
admin_browser_page,
|
||||
pick_available_role,
|
||||
save_web_failure_screenshot,
|
||||
)
|
||||
|
||||
|
||||
@pytest.fixture(params=["chromium", "firefox"])
|
||||
def browser_name(admin_config, request):
|
||||
"""每个浏览器执行一轮。"""
|
||||
browsers = admin_config.get("browsers", ["chromium", "firefox"])
|
||||
request.param = browsers[len(getattr(request, "_index", 0))]
|
||||
if request.param not in browsers:
|
||||
pytest.skip(f"浏览器 {request.param} 未在配置 browsers 中启用")
|
||||
return request.param
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def page(admin_config, browser_name, request) -> Page:
|
||||
"""Playwright Page,加载登录态,失败自动截图。"""
|
||||
viewport = admin_config.get("viewport", {"width": 1920, "height": 1080})
|
||||
timeout = admin_config.get("timeout_seconds", 120) * 1000
|
||||
skip_login = admin_config.get("skip_login", True)
|
||||
"""Playwright Page,加载可用登录态,失败自动截图。"""
|
||||
storage_state_dir = Path(admin_config.get("storage_state_dir", "tests/web/auth"))
|
||||
skip_login = admin_config.get("skip_login", True)
|
||||
role = pick_available_role(storage_state_dir, browser_name) if skip_login else None
|
||||
|
||||
with sync_playwright() as p:
|
||||
browser_launcher = getattr(p, browser_name)
|
||||
browser = browser_launcher.launch(headless=True)
|
||||
|
||||
context_kwargs = {
|
||||
"viewport": {"width": viewport["width"], "height": viewport["height"]},
|
||||
"locale": "zh-CN",
|
||||
}
|
||||
|
||||
loaded_role = None
|
||||
if skip_login:
|
||||
loaded_role = _load_auth_state(context_kwargs, storage_state_dir, browser_name)
|
||||
|
||||
context = browser.new_context(**context_kwargs)
|
||||
page = context.new_page()
|
||||
page.set_default_timeout(timeout)
|
||||
page._auth_role = loaded_role
|
||||
|
||||
yield page
|
||||
|
||||
if hasattr(request.node, "rep_call") and request.node.rep_call.failed:
|
||||
scenario_dir = SCREENSHOTS_DIR / request.node.name
|
||||
scenario_dir.mkdir(parents=True, exist_ok=True)
|
||||
ts = datetime.now().strftime("%Y%m%d_%H%M%S")
|
||||
path = str(scenario_dir / f"FAIL_{browser_name}_{ts}.png")
|
||||
page.screenshot(path=path, full_page=True)
|
||||
|
||||
context.close()
|
||||
browser.close()
|
||||
with admin_browser_page(admin_config, browser_name, role=role) as (p, loaded_role):
|
||||
p._auth_role = loaded_role
|
||||
yield p
|
||||
save_web_failure_screenshot(p, request, tag=browser_name)
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -96,31 +74,15 @@ def ensure_login(admin_config, page, config):
|
||||
f" python tests/web/admin/save_auth.py --role {role}"
|
||||
)
|
||||
|
||||
# skip_login: false
|
||||
# skip_login: false — 实时 UI 登录
|
||||
from tests.pages.admin.login_page import LoginPage
|
||||
|
||||
page.goto(f"{base_url}/#/login")
|
||||
page.get_by_placeholder("请输入用户名").fill(account["phone"])
|
||||
page.get_by_placeholder("请输入密码").fill(account["password"])
|
||||
page.get_by_role("button", name="登录").click()
|
||||
page.wait_for_timeout(3000)
|
||||
if "#/login" in page.url or "/login" in page.url:
|
||||
try:
|
||||
LoginPage(page).login(account["phone"], account["password"])
|
||||
except AssertionError as e:
|
||||
raise RuntimeError(
|
||||
"登录失败!可能存在图形验证码。请改为手动登录: python tests/web/admin/save_auth.py"
|
||||
)
|
||||
) from e
|
||||
|
||||
return _ensure_login
|
||||
|
||||
|
||||
def _load_auth_state(context_kwargs: dict, storage_dir: Path, browser: str) -> str | None:
|
||||
auth_files = list(storage_dir.glob(f"*_{browser}.json")) if storage_dir.exists() else []
|
||||
if not auth_files:
|
||||
return None
|
||||
auth_file = auth_files[0]
|
||||
context_kwargs["storage_state"] = str(auth_file)
|
||||
return auth_file.stem.replace(f"_{browser}", "")
|
||||
|
||||
|
||||
@pytest.hookimpl(tryfirst=True, hookwrapper=True)
|
||||
def pytest_runtest_makereport(item, call):
|
||||
outcome = yield
|
||||
rep = outcome.get_result()
|
||||
setattr(item, f"rep_{rep.when}", rep)
|
||||
|
||||
Reference in New Issue
Block a user