chore: 格式化e2e测试

cypress/e2e/container.cy.ts

@@ -86,13 +86,12 @@ describe('容器管理', function() {
     validateExport();
   });
 
-  const {validateAdd, validateEdit} = validatePut(
-    MODAL_NAME,
-    LABEL,
-  );
-
   it('表格操作', function() {
-    // 新增
+    const {validateAdd, validateEdit} = validatePut(
+      MODAL_NAME,
+      LABEL,
+    );
+
     validateAdd(function() {
       cy.getTestId('field_containerName').type('name');
       cy.getTestId('field_containerType').type('type');
@@ -100,7 +99,6 @@ describe('容器管理', function() {
       selectClick('select_containerDepartment', 2);
     });
 
-    // 修改
     validateEdit(TABLE_NAME, function() {
       cy.getTestId('field_containerName').should('have.value', '仓库1');
       cy.getTestId('field_containerType').should('have.value', '随便');
@@ -108,10 +106,9 @@ describe('容器管理', function() {
       validateSelect('select_containerDepartment', '仓储部门');
     });
 
-    // 删除
     validateDelete(TABLE_NAME, LABEL);
 
-    // 报废
+    // #region 报废
     tableBtnClick(TABLE_NAME, 2);
 
     cy.getTestId('container_scrap_modal').find('h3')
@@ -121,6 +118,7 @@ describe('容器管理', function() {
     cy.get('#operation_scrapNote').type('报废理由');
 
     validateModalOperation('container_scrap_modal', '报废成功');
+    // #endregion
   });
 
   it('报废列表', function() {

cypress/e2e/department.cy.ts

@@ -48,11 +48,9 @@ describe('部门管理', function() {
         MODAL_NAME = 'department_modal',
         LABEL = '部门';
 
-  it('部门列表', function() {
+  it('列表', function() {
     validateTableList(TABLE_NAME);
-  });
 
-  it('搜索', function() {
     const validate = validateTableSearch(TABLE_NAME);
 
     cy.get('#filter_departmentCode').type('TLD0004');
@@ -62,34 +60,24 @@ describe('部门管理', function() {
     cy.get('#filter_departmentName').type('name');
     cy.get('#filter_departmentCode').clear();
     validate('searchName');
+
+    validateExport();
   });
 
-  const {validateAdd, validateEdit} = validatePut(
-    MODAL_NAME,
-    LABEL,
-  );
+  it('列表操作', function() {
+    const {validateAdd, validateEdit} = validatePut(
+      MODAL_NAME,
+      LABEL,
+    );
 
-  it('新增部门', function() {
-    function fillField() {
+    validateAdd(function() {
       cy.getTestId('field_departmentName').type('测试部门名称');
-    }
-
-    validateAdd(fillField);
-  });
+    });
 
-  it('修改部门', function() {
-    function validateField() {
+    validateEdit(TABLE_NAME, function() {
       cy.getTestId('field_departmentName').should('have.value', '包装部门');
-    }
+    });
 
-    validateEdit(TABLE_NAME, validateField);
-  });
-
-  it('删除部门', function() {
     validateDelete(TABLE_NAME, LABEL);
   });
-
-  it('导出', function() {
-    validateExport();
-  });
 });

cypress/e2e/goods.cy.ts

@@ -48,22 +48,22 @@ describe('货品管理', function() {
 
   it('表格', function() {
     validateTableList(TABLE_NAME);
-  });
 
-  it('搜索', function() {
     const validate = validateTableSearch(TABLE_NAME, 'searchCode');
 
     cy.get('#filter_goodsCode').type('P00012');
     validate();
+
+    validateExport();
   });
 
-  const {validateAdd, validateEdit} = validatePut(
-    MODAL_NAME,
-    LABEL,
-  );
+  it('列表操作', function() {
+    const {validateAdd, validateEdit} = validatePut(
+      MODAL_NAME,
+      LABEL,
+    );
 
-  it('新增', function() {
-    function inputField() {
+    validateAdd(function() {
       cy.getTestId('field_goodsItemNumber').type('品号');
       cy.getTestId('field_goodsName').type('goodsName');
       cy.getTestId('field_goodsType').type('goodsType');
@@ -79,13 +79,9 @@ describe('货品管理', function() {
       cy.getTestId('field_goodsUnit').type('goodsUnit');
       selectClick('select_goodsStorageLocation');
       selectClick('select_goodsUserDepartment');
-    }
-
-    validateAdd(inputField);
-  });
+    });
 
-  it('修改', function() {
-    function validateField() {
+    validateEdit(TABLE_NAME, function() {
       cy.getTestId('field_goodsItemNumber').should('have.value', 'P00012');
       cy.getTestId('field_goodsName').should('have.value', '测试货品');
       cy.getTestId('field_goodsType').should('have.value', '类型1');
@@ -101,16 +97,8 @@ describe('货品管理', function() {
       cy.getTestId('field_goodsUnit').should('have.value', '公斤');
       validateSelect('select_goodsStorageLocation', '1号库位');
       validateSelect('select_goodsUserDepartment', '物流部门');
-    }
-
-    validateEdit(TABLE_NAME, validateField);
-  });
+    });
 
-  it('删除', function() {
     validateDelete(TABLE_NAME, LABEL);
   });
-
-  it('导出', function() {
-    validateExport();
-  });
 });

cypress/e2e/menu.cy.ts

@@ -50,11 +50,13 @@ describe('菜单管理', function() {
         MODAL_NAME = 'menu_modal',
         LABEL = '菜单';
 
+  const CHILD_TALBE_NAME = 'child_menu_table',
+        CHILD_MODAL_NAME = 'child_menu_modal',
+        CHILD_LABEL = '菜单';
+
   it('表格', function() {
     validateTableList(TABLE_NAME);
-  });
 
-  it('搜索', function() {
     const validate = validateTableSearch(TABLE_NAME, '菜单搜索');
 
     cy.get('#filter_menuName').type('name');
@@ -62,52 +64,41 @@ describe('菜单管理', function() {
     validate();
   });
 
-  it('删除', function() {
-    validateDelete(TABLE_NAME, LABEL);
-  });
-
-  const {validateAdd, validateEdit} = validatePut(MODAL_NAME, LABEL);
-
-  it('新增', function() {
+  it('列表操作', function() {
+    const {validateAdd, validateEdit} = validatePut(MODAL_NAME, LABEL);
     validateAdd(function() {
       cy.getTestId('field_menuName').type('菜单名称');
       cy.getTestId('field_menuUrl').type('/test');
       cy.getTestId('field_menuOrderBy').clear().type('8');
     });
-  });
 
-  it('修改', function() {
     validateEdit(TABLE_NAME, function() {
       cy.getTestId('field_menuName').should('have.value', '用户设置');
       cy.getTestId('field_menuUrl').should('have.value', '.');
       cy.getTestId('field_menuOrderBy').should('have.value', '1');
     });
-  });
 
-  const CHILD_TALBE_NAME = 'child_menu_table',
-        CHILD_MODAL_NAME = 'child_menu_modal',
-        CHILD_LABEL = '菜单';
+    validateDelete(TABLE_NAME, LABEL);
 
-  it('子菜单展示', function() {
+    // #region 子菜单
     tableBtnClick(TABLE_NAME, 2);
 
     cy.getTestId('child_menu').should('exist').and('be.visible');
 
     validateTableList(CHILD_TALBE_NAME);
-  });
-
-  it('子菜单关闭', function() {
-    tableBtnClick(TABLE_NAME, 2);
 
     cy.getTestId('child_menu').should('exist').and('be.visible');
 
     closeModal();
+
     cy.getTestId('child_menu').should('not.exist');
+    // #endregion
   });
 
-  it('子菜单查询', function() {
+  it('子菜单操作', function() {
     tableBtnClick(TABLE_NAME, 2);
 
+    // #region 搜索
     const validate = validateTableSearch(
       CHILD_TALBE_NAME,
       'childMenuSearch',
@@ -116,40 +107,29 @@ describe('菜单管理', function() {
     cy.get('#filter_childMenuName').type('子菜单名称');
 
     validate();
-  });
-
-  it('子菜单删除', function() {
-    tableBtnClick(TABLE_NAME, 2);
-
-    validateDelete(CHILD_TALBE_NAME, CHILD_LABEL);
-  });
-
-  const {
-    validateAdd: childValidateAdd,
-    validateEdit: childValidateEdit,
-  } = validatePut(
-    CHILD_MODAL_NAME,
-    CHILD_LABEL,
-    {addBtnTestId: 'child_menu_add_btn'},
-  );
-
-  it('子菜单新增', function() {
-    tableBtnClick(TABLE_NAME, 2);
+    // #endregion
+
+    const {
+      validateAdd: childValidateAdd,
+      validateEdit: childValidateEdit,
+    } = validatePut(
+      CHILD_MODAL_NAME,
+      CHILD_LABEL,
+      {addBtnTestId: 'child_menu_add_btn'},
+    );
 
     childValidateAdd(function() {
       cy.getTestId('field_menuName').type('菜单名称');
       cy.getTestId('field_menuUrl').type('/test');
       cy.getTestId('field_menuOrderBy').clear().type('8');
     });
-  });
-
-  it('子菜单修改', function() {
-    tableBtnClick(TABLE_NAME, 2);
 
     childValidateEdit(CHILD_TALBE_NAME, function() {
       cy.getTestId('field_menuName').should('have.value', '用户管理');
       cy.getTestId('field_menuUrl').should('have.value', '/user');
       cy.getTestId('field_menuOrderBy').should('have.value', '0');
     });
+
+    validateDelete(CHILD_TALBE_NAME, CHILD_LABEL);
   });
 });

cypress/e2e/pdaMenu.cy.ts

@@ -50,9 +50,7 @@ describe('PDA菜单管理', function() {
 
   it('表格', function() {
     validateTableList(TABLE_NAME);
-  });
 
-  it('搜索', function() {
     const validate = validateTableSearch(TABLE_NAME, 'search');
 
     cy.get('#filter_menuName').type('name');
@@ -60,25 +58,21 @@ describe('PDA菜单管理', function() {
     validate();
   });
 
-  it('删除', function() {
-    validateDelete(TABLE_NAME, LABEL);
-  });
-
-  const {validateAdd, validateEdit} = validatePut(MODAL_NAME, LABEL);
+  it('表格操作', function() {
+    const {validateAdd, validateEdit} = validatePut(MODAL_NAME, LABEL);
 
-  it('新增', function() {
     validateAdd(function() {
       cy.getTestId('field_menuName').type('菜单名称');
       cy.getTestId('field_menuID').type('test');
       cy.getTestId('field_menuOrderBy').clear().type('8');
     });
-  });
 
-  it('修改', function() {
     validateEdit(TABLE_NAME, function() {
       cy.getTestId('field_menuName').should('have.value', '用户设置');
       cy.getTestId('field_menuID').should('have.value', '.');
       cy.getTestId('field_menuOrderBy').should('have.value', '1');
     });
+
+    validateDelete(TABLE_NAME, LABEL);
   });
 });

cypress/e2e/role.cy.ts

@@ -50,41 +50,36 @@ describe('角色管理', function() {
         MODAL_NAME = 'role_modal',
         LABEL = '角色';
 
-  it('角色列表', function() {
+  it('列表', function() {
     validateTableList(TABLE_NAME);
-  });
 
-  it('搜索', function() {
     const validate = validateTableSearch(TABLE_NAME, 'roleSearch');
 
     cy.get('#filter_roleName').type('roleName');
     validate();
+
+    validateExport();
   });
 
-  const {validateAdd, validateEdit} = validatePut(
-    MODAL_NAME,
-    LABEL,
-  );
+  it('表单操作', function() {
+    const {validateAdd, validateEdit} = validatePut(
+      MODAL_NAME,
+      LABEL,
+    );
 
-  it('新增操作', function() {
     validateAdd(function() {
       cy.get('#operation_roleName').type('roleName');
       cy.get('#operation_roleRemarks').type('roleRemarks');
     });
-  });
 
-  it('修改操作', function() {
     validateEdit(TABLE_NAME, function() {
       cy.get('#operation_roleName').should('have.value', '仓库管理员');
       cy.get('#operation_roleRemarks').should('have.value', 'cangk');
     });
-  });
 
-  it('删除操作', function() {
     validateDelete(TABLE_NAME, LABEL);
-  });
 
-  it('设置菜单权限', function() {
+    // #region 菜单权限
     tableBtnClick(TABLE_NAME, 2);
 
     cy.getTestId('role_tree_modal').find('h3')
@@ -104,9 +99,9 @@ describe('角色管理', function() {
 
     cy.get('.ant-message-notice-content').should('include.text', '设置成功');
     cy.getTestId('role_tree_modal').should('not.exist');
-  });
+    // #endregion
 
-  it('设置pda权限', function() {
+    // #region pda权限
     tableBtnClick(TABLE_NAME, 3);
 
     cy.get('.ant-transfer-list').eq(0).find('.ant-transfer-list-content')
@@ -120,9 +115,6 @@ describe('角色管理', function() {
 
     cy.get('.ant-message-notice-content').should('include.text', '设置成功');
     cy.getTestId('role_tree_modal').should('not.exist');
-  });
-
-  it('导出', function() {
-    validateExport();
+    // #endregion
   });
 });

cypress/e2e/storage.cy.ts

@@ -59,9 +59,7 @@ describe('库位管理', function() {
 
   it('表格', function() {
     validateTableList(TABLE_NAME);
-  });
 
-  it('搜索', function() {
     const validate = validateTableSearch(TABLE_NAME);
 
     cy.get('#filter_storageName').type('库位');
@@ -78,18 +76,16 @@ describe('库位管理', function() {
     cy.get('#filter_storageType').clear();
     selectClick('filter_storageState', 1);
     validate('searchDisabled');
-  });
 
-  it('删除', function() {
-    validateDelete(TABLE_NAME, LABEL);
+    validateExport();
   });
 
-  const {validateAdd, validateEdit} = validatePut(
-    MODAL_NAME,
-    LABEL,
-  );
+  it('操作', function() {
+    const {validateAdd, validateEdit} = validatePut(
+      MODAL_NAME,
+      LABEL,
+    );
 
-  it('新增', function() {
     validateAdd(function() {
       cy.getTestId('field_storageLocationCode').type('0001');
       cy.getTestId('field_storageLocationName').type('名称');
@@ -98,9 +94,7 @@ describe('库位管理', function() {
       cy.getTestId('field_storageCapacity').clear().type('5');
       selectClick('select_storageIsNotDisable', 1);
     });
-  });
 
-  it('修改', function() {
     validateEdit(TABLE_NAME, function() {
       cy.getTestId(MODAL_NAME).should('exist').and('be.visible');
       cy.getTestId(MODAL_NAME).find('h3').should('include.text', '修改库位');
@@ -112,9 +106,7 @@ describe('库位管理', function() {
       cy.getTestId('field_storageCapacity').should('have.value', '8');
       validateSelect('select_storageIsNotDisable', '启用');
     });
-  });
 
-  it('导出', function() {
-    validateExport();
+    validateDelete(TABLE_NAME, LABEL);
   });
 });

cypress/e2e/user.cy.ts

@@ -56,9 +56,7 @@ describe('用户管理', function() {
 
   it('用户列表', function() {
     validateTableList(TABLE_NAME);
-  });
 
-  it('搜索', function() {
     const validate = validateTableSearch(TABLE_NAME);
     cy.get('.ant-pagination').find('li[title="2"]').click();
 
@@ -69,18 +67,16 @@ describe('用户管理', function() {
     cy.get('input[name="useName"]').clear();
     cy.get('input[name="useCode"]').type('1234');
     validate('searchCode');
-  });
 
-  it('删除操作', function() {
-    validateDelete(TABLE_NAME, LABEL);
+    validateExport();
   });
 
-  const {validateAdd, validateEdit} = validatePut(
-    MODAL_NAME,
-    LABEL,
-  );
+  it('操作', function() {
+    const {validateAdd, validateEdit} = validatePut(
+      MODAL_NAME,
+      LABEL,
+    );
 
-  it('新增操作', function() {
     validateAdd(function() {
       cy.get('input[name="userName"]').type('name');
       cy.get('input[name="userPassword"]').type('password');
@@ -91,14 +87,13 @@ describe('用户管理', function() {
       selectClick('select_userDepartment', 0);
       selectClick('select_userRole', 0);
     });
-  });
 
-  it('修改操作', function() {
     validateEdit(TABLE_NAME, function() {
       cy.get('input[name="userName"]').should('have.value', '123412');
       cy.get('input[name="userPassword"]').should(
         'have.value',
-        '44349BD19046F3D527D67A5D0D414B09');
+        '44349BD19046F3D527D67A5D0D414B09',
+      );
       cy.get('input[name="userRealName"]').should('have.value', '测试');
       cy.get('input[name="userEmail"]').should('have.value', '123@adfa.com');
       cy.get('input[name="userLandline"]').should('have.value', '1231123');
@@ -106,9 +101,7 @@ describe('用户管理', function() {
       validateSelect('select_userDepartment', '物流部门');
       validateSelect('select_userRole', '物流管理员');
     });
-  });
 
-  it('导出', function() {
-    validateExport();
+    validateDelete(TABLE_NAME, LABEL);
   });
 });