|
|
@@ -187,9 +187,8 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- // 刷新页面以确保树更新
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ // 刷新树形结构以显示新创建的省份
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
// 不需要展开省份节点 - "新增市"按钮在省份节点悬停时显示
|
|
|
// 直接打开新增子区域对话框
|
|
|
@@ -220,11 +219,10 @@ test.describe.serial('添加区域测试', () => {
|
|
|
// 等待对话框关闭
|
|
|
await regionManagementPage.waitForDialogClosed();
|
|
|
|
|
|
- // 重要:需要重新加载页面以获取最新的树数据
|
|
|
+ // 刷新树形结构以显示新创建的城市
|
|
|
// 城市创建后,树的父子关系需要重新加载才能显示展开按钮
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
- await page.waitForTimeout(2000);
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
+ await page.waitForTimeout(1000);
|
|
|
|
|
|
// 验证省份存在
|
|
|
const provinceExists = await regionManagementPage.regionExists(provinceName);
|
|
|
@@ -258,9 +256,8 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- // 刷新页面以确保省份可见
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ // 刷新树形结构以显示新创建的省份
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
// 创建城市(提供 code 字段)
|
|
|
const cityName = generateUniqueRegionName('测试市');
|
|
|
@@ -275,9 +272,8 @@ test.describe.serial('添加区域测试', () => {
|
|
|
const createResponse = cityResult.responses.find(r => r.method === 'POST' && r.url.includes('/areas'));
|
|
|
expect(createResponse?.ok).toBe(true);
|
|
|
|
|
|
- // 刷新页面并验证
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ // 刷新树形结构以显示新创建的城市
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
const provinceExists = await regionManagementPage.regionExists(provinceName);
|
|
|
expect(provinceExists).toBe(true);
|
|
|
@@ -302,8 +298,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
// 创建市级
|
|
|
const cityName = generateUniqueRegionName('测试市');
|
|
|
@@ -314,8 +309,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
expect(cityResult.success).toBe(true);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
// 创建区级
|
|
|
const districtName = generateUniqueRegionName('测试区');
|
|
|
@@ -326,8 +320,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
expect(districtResult.success).toBe(true);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
// 添加街道
|
|
|
const streetName = generateUniqueRegionName('测试街道');
|
|
|
@@ -356,8 +349,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
const cityName = generateUniqueRegionName('测试市');
|
|
|
const cityResult = await regionManagementPage.createChildRegion(provinceName, '市', {
|
|
|
@@ -367,8 +359,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
expect(cityResult.success).toBe(true);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
const districtName = generateUniqueRegionName('测试区');
|
|
|
const districtResult = await regionManagementPage.createChildRegion(provinceName, '市', {
|
|
|
@@ -378,8 +369,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
expect(districtResult.success).toBe(true);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
const streetName = generateUniqueRegionName('测试街道');
|
|
|
const streetResult = await regionManagementPage.createChildRegion(provinceName, '市', {
|
|
|
@@ -408,8 +398,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
// 首先创建一个市
|
|
|
const cityName = generateUniqueRegionName('测试市');
|
|
|
@@ -421,8 +410,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
expect(cityResult.success).toBe(true);
|
|
|
|
|
|
// 然后向该市添加区
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
const districtName = generateUniqueRegionName('测试区');
|
|
|
const districtResult = await regionManagementPage.createChildRegion(provinceName, '市', {
|
|
|
@@ -449,8 +437,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
const cityName = generateUniqueRegionName('测试市');
|
|
|
const cityResult = await regionManagementPage.createChildRegion(provinceName, '市', {
|
|
|
@@ -487,8 +474,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
await regionManagementPage.openAddChildDialog(provinceName, '市');
|
|
|
|
|
|
@@ -510,8 +496,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
// 添加市
|
|
|
const cityName = generateUniqueRegionName('测试市');
|
|
|
@@ -532,8 +517,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
expect(districtResult.success).toBe(true);
|
|
|
|
|
|
// 添加街道
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
const streetName = generateUniqueRegionName('测试街道');
|
|
|
const streetResult = await regionManagementPage.createChildRegion(provinceName, '市', {
|
|
|
@@ -568,8 +552,7 @@ test.describe.serial('添加区域测试', () => {
|
|
|
});
|
|
|
createdProvinces.push(provinceName);
|
|
|
|
|
|
- await page.goto('/admin/areas');
|
|
|
- await regionManagementPage.waitForTreeLoaded();
|
|
|
+ await regionManagementPage.refreshTree();
|
|
|
|
|
|
// 创建多个子区域,验证它们都属于同一父级
|
|
|
const city1Name = generateUniqueRegionName('测试市1');
|