调整部分前端布局和后端增删改逻辑
This commit is contained in:
@@ -15,7 +15,7 @@ class BasePageTest:
|
||||
"""初始化浏览器和登录"""
|
||||
# 首先登录获取token
|
||||
helper = LoginHelper()
|
||||
self.token = helper.login(username='admin', password='admin123')
|
||||
self.token = helper.login(username='admin')
|
||||
assert self.token is not None, '登录应该成功'
|
||||
|
||||
# 启动浏览器
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import os
|
||||
|
||||
import requests
|
||||
|
||||
from common.config import Config
|
||||
@@ -12,10 +14,13 @@ class LoginHelper:
|
||||
self.base_url = base_url
|
||||
self.session = requests.Session()
|
||||
|
||||
def login(self, username: str = 'admin', password: str = 'admin123', max_retries: int = 3) -> str | None:
|
||||
def login(self, username: str = 'admin', password: str | None = None, max_retries: int = 3) -> str | None:
|
||||
"""
|
||||
执行登录操作(在测试环境中,验证码已禁用)
|
||||
"""
|
||||
if password is None:
|
||||
password = get_test_password(username)
|
||||
|
||||
for _attempt in range(max_retries):
|
||||
# 在测试环境中,验证码已禁用,所以直接登录
|
||||
login_data = {'username': username, 'password': password}
|
||||
@@ -47,6 +52,15 @@ class LoginHelper:
|
||||
return None
|
||||
|
||||
|
||||
def get_test_password(username: str) -> str:
|
||||
"""读取测试账号密码,避免把凭据写入测试代码或日志。"""
|
||||
env_name = f'SHIERFENG_TEST_{username.upper()}_PASSWORD'
|
||||
password = os.getenv(env_name)
|
||||
if not password:
|
||||
raise RuntimeError(f'未设置测试账号密码环境变量: {env_name}')
|
||||
return password
|
||||
|
||||
|
||||
# 使用示例
|
||||
if __name__ == '__main__':
|
||||
helper = LoginHelper()
|
||||
|
||||
Reference in New Issue
Block a user