feat: 菜单树缺少根节点异常处理

This commit is contained in:
zy7y
2022-09-18 15:01:20 +08:00
parent 80947a608e
commit aefb93b399
8 changed files with 232 additions and 227 deletions

View File

@@ -8,8 +8,8 @@ from schemas.user import RoleActive, UserAdd
base = "http://localhost:8000"
params = [
# 创建菜单
dirs = [
(
"/menu",
MenuIn( # id 1
@@ -38,267 +38,256 @@ params = [
method=None,
).dict(),
),
# 组件
]
@pytest.mark.parametrize("path, data", dirs)
def test_add_dir(path, data):
"""添加一级目录"""
res = client.post(url=base + path, json=data)
logger.info(res.json())
assert res.status_code == 200
menus = [
(
"/menu",
MenuIn( # id 3
name="用户管理",
meta={"icon": "TeamOutlined"},
meta={"icon": "TeamOutlined", "title": "用户管理"},
path="/system/user",
type=1,
component="/system/user/user.vue",
pid=1,
identifier=None,
api="/user",
method="GET",
).dict(),
),
(
"/menu",
MenuIn( # id 4
name="角色管理",
meta={"icon": "UserOutlined"},
meta={"icon": "UserOutlined", "title": "角色管理"},
path="/system/role",
type=1,
component="/system/role/role.vue",
pid=1,
identifier=None,
api="/role",
method="GET",
).dict(),
),
(
"/menu",
MenuIn( # id 5
name="菜单管理",
meta={"icon": "MenuOutlined"},
meta={"icon": "MenuOutlined", "title": "菜单管理"},
path="/system/menu",
type=1,
component="/system/menu/menu.vue",
pid=1,
identifier=None,
api="/menu",
method="GET",
).dict(),
),
(
"/menu",
MenuIn( # id 6
name="关于",
meta={"icon": "DashboardOutlined"},
meta={"icon": "DashboardOutlined", "title": "关于"},
path="/setting/about",
type=1,
component="/setting/about/about.vue",
pid=2,
identifier=None,
).dict(),
),
# 按钮
(
"/menu",
MenuIn(
name="用户新增",
meta={"icon": "Add"},
path=None,
type=2,
component=None,
pid=3,
identifier="user:create",
api="/user",
method="POST",
).dict(),
),
(
"/menu",
MenuIn(
name="用户删除",
meta={"icon": "Delete"},
path=None,
type=2,
component=None,
pid=3,
identifier="user:delete",
api="/user/{pk}",
method="DELETE",
).dict(),
),
(
"/menu",
MenuIn(
name="用户更新",
meta={"icon": "Update"},
path=None,
type=2,
component=None,
pid=3,
identifier="user:update",
api="/user/{pk}",
method="PUT",
).dict(),
),
(
"/menu",
MenuIn(
name="用户详情",
meta={"icon": "Info"},
path=None,
type=2,
component=None,
pid=3,
identifier="user:get",
api="/user/{pk}",
method="GET",
).dict(),
),
(
"/menu",
MenuIn(
name="用户查询",
meta={"icon": "Search"},
path=None,
type=2,
component=None,
pid=3,
identifier="user:query",
api="/user/query",
method="POST",
).dict(),
),
# 角色管理
(
"/menu",
MenuIn(
name="角色新增",
meta={"icon": "Add"},
path=None,
type=2,
component=None,
pid=4,
identifier="role:create",
api="/role",
method="POST",
).dict(),
),
(
"/menu",
MenuIn(
name="角色删除",
meta={"icon": "Delete"},
path=None,
type=2,
component=None,
pid=4,
identifier="role:delete",
api="/role/{pk}",
method="DELETE",
).dict(),
),
(
"/menu",
MenuIn(
name="查询角色拥有权限",
meta={"icon": "Delete"},
path=None,
type=2,
component=None,
pid=4,
identifier=None,
api="/role/{rid}/menu",
method="GET",
).dict(),
),
(
"/menu",
MenuIn(
name="查询角色",
meta={"icon": "Search"},
path=None,
type=2,
component=None,
pid=4,
identifier="role:query",
api="/role/query",
method="POST",
).dict(),
),
(
"/menu",
MenuIn(
name="更新角色",
meta={"icon": "Update"},
path=None,
type=2,
component=None,
pid=4,
identifier="role:update",
api="/role/{pk}",
method="PUT",
).dict(),
),
# 菜单管理的权限
(
"/menu",
MenuIn(
name="新增菜单",
meta={"icon": "Update"},
path=None,
type=2,
component=None,
pid=5,
identifier="menu:create",
api="/menu",
method="POST",
).dict(),
),
(
"/menu",
MenuIn(
name="删除菜单",
meta={"icon": "Delete"},
path=None,
type=2,
component=None,
pid=5,
identifier="menu:delete",
api="/menu/{pk}",
method="DELETE",
).dict(),
),
]
@pytest.mark.parametrize("path,data", menus)
def test_add_menu(path, data):
"""添加二级菜单"""
res = client.post(url=base + path, json=data)
logger.info(res.json())
assert res.status_code == 200
user_manager_pre = [
MenuIn(
name="用户详情",
type=3,
identifier="user:get",
api="/user/{pk}",
method="GET",
),
MenuIn(
name="用户列表",
type=3, # 数据类
api="/user",
method="GET",
),
MenuIn(
name="用户查询",
type=2,
identifier="user:query",
api="/user/query",
method="POST",
),
MenuIn(
name="用户新增",
type=2,
identifier="user:create",
api="/user",
method="POST",
),
MenuIn(
name="用户删除",
type=2,
identifier="user:delete",
api="/user/{pk}",
method="DELETE",
),
MenuIn(
name="用户更新",
type=2,
identifier="user:update",
api="/user/{pk}",
method="PUT",
),
]
@pytest.mark.parametrize("data", user_manager_pre)
def test_add_user_pre(data):
"""用户管理相关权限"""
data.pid = 3
res = client.post(url=base + "/menu", json=data.dict())
logger.info(res.json())
assert res.status_code == 200
role_manager_pre = [
MenuIn(
name="查询角色拥有权限",
type=3,
api="/role/{rid}/menu",
method="GET",
),
MenuIn(
name="角色列表",
type=3,
api="/role",
method="GET",
),
MenuIn(
name="角色查询",
meta={"icon": "Search"},
type=2,
identifier="role:query",
api="/role/query",
method="POST",
),
MenuIn(
name="角色新增",
type=2,
identifier="role:create",
api="/role",
method="POST",
),
MenuIn(
name="角色删除",
type=2,
identifier="role:delete",
api="/role/{pk}",
method="DELETE",
),
MenuIn(
name="角色更新",
type=2,
identifier="role:update",
api="/role/{pk}",
method="PUT",
),
]
@pytest.mark.parametrize("data", role_manager_pre)
def test_add_role_pre(data):
"""角色管理相关权限"""
logger.debug(data.dict())
data.pid = 4
res = client.post(url=base + "/menu", json=data.dict())
logger.info(res.json())
assert res.status_code == 200
menu_manager_pre = [
MenuIn(
name="菜单列表",
type=3,
api="/menu",
method="GET",
),
MenuIn(
name="菜单新增",
type=2,
identifier="menu:create",
api="/menu",
method="POST",
),
MenuIn(
name="菜单更新",
type=2,
identifier="menu:update",
api="/menu/{pk}",
method="PUT",
),
MenuIn(
name="菜单删除",
type=2,
identifier="menu:delete",
api="/menu/{pk}",
method="DELETE",
),
]
@pytest.mark.parametrize("data", menu_manager_pre)
def test_add_menu_pre(data):
"""菜单管理相关权限"""
data.pid = 5
res = client.post(url=base + "/menu", json=data.dict())
logger.info(res.json())
assert res.status_code == 200
menus_len = (
len(user_manager_pre)
+ len(menus)
+ len(dirs)
+ len(role_manager_pre)
+ len(menu_manager_pre)
)
datas = [
(
"/role",
RoleIn(
name="super",
name="superStar",
remark="全部权限",
menus=[num for num in range(1, len(params) + 1)],
).dict(),
menus=[num for num in range(1, menus_len)],
),
),
# 创建用户
(
"/user",
UserAdd(
username="admin",
nickname="管理员",
nickname="666管理员",
password="123456",
roles=[RoleActive(rid=1, status=5)],
).dict(),
),
),
]
@pytest.mark.parametrize("path, data", params)
def test_add_data(path, data):
"""注册菜单"""
res = client.post(url=base + path, json=data)
logger.info(res.json())
assert res.status_code == 200
@pytest.mark.parametrize("path, data", datas)
def test_add_user(path, data):
"""添加账号"""
res = client.post(url=base + path, json=data)
res = client.post(url=base + path, json=data.dict())
logger.info(res.json())
logger.info(menus_len)
assert res.status_code == 200