Skip to content

Commit 611fcc3

Browse files
committed
perf: 优化测试
1 parent 1f437be commit 611fcc3

File tree

10 files changed

+36
-36
lines changed

10 files changed

+36
-36
lines changed

ruoyi-fastapi-test/common/base_page_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ async def get_text_content(self, selector: str) -> str:
7979

8080
async def get_table_total_rows(self) -> int:
8181
"""获取表格总行数"""
82-
element = self.page.locator('span.el-pagination__total.is-first').first
82+
element = self.page.locator('span.el-pagination__total').first
8383
text = await element.text_content()
8484

8585
# 提取数字

ruoyi-fastapi-test/monitor/test_job_management.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ async def create_job(
3030
await self.page.get_by_role('button', name='新增').click()
3131

3232
# 等待对话框
33-
dialog = self.page.locator('.el-dialog:visible')
33+
dialog = self.page.get_by_role('dialog')
3434
await dialog.wait_for()
3535

3636
# 填写表单
37-
await dialog.get_by_role('textbox', name='* 任务名称').fill(job_name)
37+
await dialog.get_by_role('textbox', name='任务名称').fill(job_name)
3838

3939
# 选择任务分组
4040
await dialog.locator("label:has-text('任务分组') + div .el-select").click()
@@ -45,10 +45,10 @@ async def create_job(
4545
await self.page.get_by_role('option', name=job_executor).click()
4646

4747
# 填写调用方法
48-
await dialog.get_by_role('textbox', name='* 调用方法').fill(invoke_target)
48+
await dialog.get_by_role('textbox', name='调用方法').fill(invoke_target)
4949

5050
# 填写cron表达式
51-
await dialog.get_by_role('textbox', name='* cron表达式').fill(cron_expression)
51+
await dialog.get_by_role('textbox', name='cron表达式').fill(cron_expression)
5252

5353
# 策略:如果"失败"策略等有默认值,就不管了
5454

@@ -72,11 +72,11 @@ async def edit_job(self, job_name: str, new_invoke_target: str) -> None:
7272
# 操作列按钮顺序: 修改, 删除, 执行一次, 详细, 日志
7373
await row.locator('button').nth(0).click()
7474

75-
dialog = self.page.locator('.el-dialog:visible')
75+
dialog = self.page.get_by_role('dialog')
7676
await dialog.wait_for()
7777

7878
# 修改调用方法
79-
await dialog.get_by_role('textbox', name='* 调用方法').fill(new_invoke_target)
79+
await dialog.get_by_role('textbox', name='调用方法').fill(new_invoke_target)
8080

8181
await dialog.get_by_role('button', name='确 定').click()
8282
await self.wait_for_selector("div:has-text('修改成功')", timeout=10000)

ruoyi-fastapi-test/system/test_config_management.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ async def create_config(self, config_name: str, config_key: str, config_value: s
2525
await self.page.get_by_role('button', name='新增').first.click()
2626

2727
# 等待对话框
28-
dialog = self.page.locator('.el-dialog:visible')
28+
dialog = self.page.get_by_role('dialog')
2929
await dialog.wait_for()
3030

3131
# 填写参数信息
32-
await dialog.get_by_role('textbox', name='* 参数名称').fill(config_name)
33-
await dialog.get_by_role('textbox', name='* 参数键名').fill(config_key)
34-
await dialog.get_by_role('textbox', name='* 参数键值').fill(config_value)
32+
await dialog.get_by_role('textbox', name='参数名称').fill(config_name)
33+
await dialog.get_by_role('textbox', name='参数键名').fill(config_key)
34+
await dialog.get_by_role('textbox', name='参数键值').fill(config_value)
3535

3636
# 等待一段时间确保输入完成
3737
await self.page.wait_for_timeout(500)
@@ -75,11 +75,11 @@ async def edit_config(self, updated_value: str) -> None:
7575
await self.page.locator('tbody').get_by_role('button', name='修改').nth(0).click()
7676

7777
# 等待对话框
78-
dialog = self.page.locator('.el-dialog:visible')
78+
dialog = self.page.get_by_role('dialog')
7979
await dialog.wait_for()
8080

8181
# 修改参数键值
82-
await dialog.get_by_role('textbox', name='* 参数键值').fill(updated_value)
82+
await dialog.get_by_role('textbox', name='参数键值').fill(updated_value)
8383

8484
# 确认
8585
await self.page.get_by_role('button', name='确 定').first.click()

ruoyi-fastapi-test/system/test_dept_management.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ async def create_dept(self, dept_name: str, order_num: str) -> None:
2525
await self.page.get_by_role('button', name='新增').first.click()
2626

2727
# 等待对话框
28-
dialog = self.page.locator('.el-dialog:visible')
28+
dialog = self.page.get_by_role('dialog')
2929
await dialog.wait_for()
3030

3131
# 上级部门
@@ -63,7 +63,7 @@ async def edit_dept(self, leader_name: str) -> None:
6363
# 树形表格结构可能不同,但通常也是在 tbody 的 row 中
6464
await self.page.locator('tbody').get_by_role('button', name='修改').nth(0).click()
6565

66-
dialog = self.page.locator('.el-dialog:visible')
66+
dialog = self.page.get_by_role('dialog')
6767
await dialog.wait_for()
6868

6969
# 修改负责人

ruoyi-fastapi-test/system/test_dict_management.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ async def create_dict_type(self, dict_name: str, dict_type: str) -> None:
2929
await self.page.get_by_role('button', name='新增').first.click()
3030

3131
# 等待对话框
32-
dialog = self.page.locator('.el-dialog:visible')
32+
dialog =self.page.get_by_role('dialog')
3333
await dialog.wait_for()
3434

3535
# 填写表单
@@ -59,7 +59,7 @@ async def edit_dict_type(self, dict_name: str, remark: str) -> None:
5959
row = self.page.locator('tbody tr').first
6060
await row.get_by_role('button', name='修改').click()
6161

62-
dialog = self.page.locator('.el-dialog:visible')
62+
dialog =self.page.get_by_role('dialog')
6363
await dialog.wait_for()
6464

6565
await dialog.get_by_role('textbox', name='备注').fill(remark)
@@ -104,7 +104,7 @@ async def create_dict_data(self, label: str, value: str, sort: str, list_class:
104104
# 点击新增按钮
105105
await self.page.get_by_role('button', name='新增').first.click()
106106

107-
dialog = self.page.locator('.el-dialog:visible')
107+
dialog =self.page.get_by_role('dialog')
108108
await dialog.wait_for()
109109

110110
await dialog.get_by_role('textbox', name='数据标签').fill(label)
@@ -139,7 +139,7 @@ async def edit_dict_data(self, label: str, remark: str) -> None:
139139
row = self.page.locator('tbody tr').filter(has_text=label).first
140140
await row.get_by_role('button', name='修改').click()
141141

142-
dialog = self.page.locator('.el-dialog:visible')
142+
dialog =self.page.get_by_role('dialog')
143143
await dialog.wait_for()
144144

145145
await dialog.get_by_role('textbox', name='备注').fill(remark)

ruoyi-fastapi-test/system/test_menu_management.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ async def create_directory(self, menu_name: str, path: str, order_num: str) -> N
2828
await self.page.get_by_role('button', name='新增').first.click()
2929

3030
# 等待对话框出现
31-
dialog = self.page.locator('.el-dialog:visible')
31+
dialog =self.page.get_by_role('dialog')
3232
await dialog.wait_for()
3333

3434
# 填写表单
@@ -61,7 +61,7 @@ async def create_sub_menu(self, parent_name: str, menu_name: str, path: str, ord
6161
await row.get_by_role('button', name='新增').click()
6262

6363
# 等待对话框
64-
dialog = self.page.locator('.el-dialog:visible')
64+
dialog =self.page.get_by_role('dialog')
6565
await dialog.wait_for()
6666

6767
# 选择菜单类型为"菜单"

ruoyi-fastapi-test/system/test_notice_management.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ async def create_notice(self, notice_title: str, notice_type: int = 1, notice_co
2525
await self.page.get_by_role('button', name='新增').first.click()
2626

2727
# 等待对话框
28-
dialog = self.page.locator('.el-dialog:visible')
28+
dialog =self.page.get_by_role('dialog')
2929
await dialog.wait_for()
3030

3131
# 填写公告信息
32-
await dialog.get_by_role('textbox', name='* 公告标题').fill(notice_title)
32+
await dialog.get_by_role('textbox', name='公告标题').fill(notice_title)
3333

3434
# 选择公告类型
3535
# 根据codegen脚本,点击下拉框触发器
@@ -73,11 +73,11 @@ async def edit_notice(self, updated_title: str, updated_content: str = '更新
7373
await self.page.locator('tbody').get_by_role('button', name='修改').nth(0).click()
7474

7575
# 等待对话框
76-
dialog = self.page.locator('.el-dialog:visible')
76+
dialog =self.page.get_by_role('dialog')
7777
await dialog.wait_for()
7878

7979
# 修改公告标题
80-
await dialog.get_by_role('textbox', name='* 公告标题').fill(updated_title)
80+
await dialog.get_by_role('textbox', name='公告标题').fill(updated_title)
8181

8282
# 修改公告内容
8383
await self.page.locator('.ql-editor').fill(updated_content)

ruoyi-fastapi-test/system/test_post_management.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ async def create_post(self, post_name: str, post_code: str, post_sort: str) -> N
5151
"""新增岗位"""
5252
await self.page.get_by_role('button', name='新增').click()
5353

54-
dialog = self.page.locator('.el-dialog:visible')
54+
dialog =self.page.get_by_role('dialog')
5555
await dialog.wait_for()
5656

5757
# 填写表单
@@ -92,7 +92,7 @@ async def edit_post(self, post_name: str, remark: str) -> None:
9292
# 点击修改按钮
9393
await row.get_by_role('button', name='修改').click()
9494

95-
dialog = self.page.locator('.el-dialog:visible')
95+
dialog =self.page.get_by_role('dialog')
9696
await dialog.wait_for()
9797

9898
# 修改备注

ruoyi-fastapi-test/system/test_role_management.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ async def create_role(self, role_name: str, role_key: str, role_sort: int = 3) -
2424
await self.page.get_by_role('button', name='新增').click()
2525

2626
# 等待对话框
27-
dialog = self.page.locator('.el-dialog:visible')
27+
dialog =self.page.get_by_role('dialog')
2828
await dialog.wait_for()
2929

3030
# 填写信息
31-
await dialog.get_by_role('textbox', name='* 角色名称').fill(role_name)
32-
await dialog.get_by_role('textbox', name='* 权限字符').fill(role_key)
33-
await dialog.get_by_role('spinbutton', name='* 角色顺序').fill(str(role_sort))
31+
await dialog.get_by_role('textbox', name='角色名称').fill(role_name)
32+
await dialog.get_by_role('textbox', name='权限字符').fill(role_key)
33+
await dialog.get_by_role('spinbutton', name='角色顺序').fill(str(role_sort))
3434

3535
# 选择菜单权限 (点击第一个复选框)
3636
await self.page.locator('.el-tree-node__content .el-checkbox').first.click()
@@ -58,7 +58,7 @@ async def edit_role(self, new_remark: str) -> None:
5858
row = self.page.locator('tbody tr').first
5959
await row.get_by_role('button').nth(0).click()
6060

61-
dialog = self.page.locator('.el-dialog:visible')
61+
dialog =self.page.get_by_role('dialog')
6262
await dialog.wait_for()
6363

6464
# 修改备注

ruoyi-fastapi-test/system/test_user_management.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ async def create_user(self, user_name: str, nick_name: str, phone: str) -> None:
2525
await self.page.get_by_role('button', name='新增').click()
2626

2727
# 等待对话框
28-
dialog = self.page.locator('.el-dialog:visible')
28+
dialog =self.page.get_by_role('dialog')
2929
await dialog.wait_for()
3030

3131
# 填写基本信息
32-
await dialog.get_by_role('textbox', name='* 用户昵称').fill(nick_name)
32+
await dialog.get_by_role('textbox', name='用户昵称').fill(nick_name)
3333

3434
# 归属部门
3535
# 使用 label 定位父级 form-item,再点击内部的 wrapper
@@ -38,7 +38,7 @@ async def create_user(self, user_name: str, nick_name: str, phone: str) -> None:
3838
# 使用 .el-popper 定位下拉框中的内容
3939
await self.page.locator('.el-popper:visible').get_by_text('集团总公司').click()
4040

41-
await dialog.get_by_role('textbox', name='* 用户名称').fill(user_name)
41+
await dialog.get_by_role('textbox', name='用户名称').fill(user_name)
4242
# 手机号码在搜索框也有,所以必须限定在 dialog 内
4343
# 注意:有些 label 可能不带 *,或者带 * 但 get_by_role 需要准确匹配
4444
# 这里使用 get_by_placeholder 或者 filter 来定位更稳妥,或者直接 scope 到 dialog
@@ -81,7 +81,7 @@ async def edit_user(self) -> None:
8181
row = self.page.locator('tbody tr').first
8282
await row.get_by_role('button').nth(0).click()
8383

84-
dialog = self.page.locator('.el-dialog:visible')
84+
dialog =self.page.get_by_role('dialog')
8585
await dialog.wait_for()
8686

8787
# 修改性别为女

0 commit comments

Comments
 (0)