|
|
@@ -474,22 +474,26 @@ describe('管理员商户管理API集成测试', () => {
|
|
|
});
|
|
|
|
|
|
expect(createResponse.status).toBe(201);
|
|
|
- const createdMerchant = await createResponse.json();
|
|
|
- expect(createdMerchant.state).toBe(1);
|
|
|
-
|
|
|
- // 更新为禁用状态
|
|
|
- const updateResponse = await client[':id'].$put({
|
|
|
- param: { id: createdMerchant.id },
|
|
|
- json: { state: 2 } // 禁用
|
|
|
- }, {
|
|
|
- headers: {
|
|
|
- 'Authorization': `Bearer ${adminToken}`
|
|
|
+ if (createResponse.status === 201) {
|
|
|
+ const createdMerchant = await createResponse.json();
|
|
|
+ expect(createdMerchant.state).toBe(1);
|
|
|
+
|
|
|
+ // 更新为禁用状态
|
|
|
+ const updateResponse = await client[':id'].$put({
|
|
|
+ param: { id: createdMerchant.id },
|
|
|
+ json: { state: 2 } // 禁用
|
|
|
+ }, {
|
|
|
+ headers: {
|
|
|
+ 'Authorization': `Bearer ${adminToken}`
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ expect(updateResponse.status).toBe(200);
|
|
|
+ if (updateResponse.status === 200) {
|
|
|
+ const updatedMerchant = await updateResponse.json();
|
|
|
+ expect(updatedMerchant.state).toBe(2);
|
|
|
}
|
|
|
- });
|
|
|
-
|
|
|
- expect(updateResponse.status).toBe(200);
|
|
|
- const updatedMerchant = await updateResponse.json();
|
|
|
- expect(updatedMerchant.state).toBe(2);
|
|
|
+ }
|
|
|
});
|
|
|
});
|
|
|
|
|
|
@@ -514,19 +518,21 @@ describe('管理员商户管理API集成测试', () => {
|
|
|
});
|
|
|
|
|
|
expect(createResponse.status).toBe(201);
|
|
|
- const createdMerchant = await createResponse.json();
|
|
|
-
|
|
|
- // 验证登录统计字段存在
|
|
|
- expect(createdMerchant).toHaveProperty('loginNum');
|
|
|
- expect(createdMerchant).toHaveProperty('loginTime');
|
|
|
- expect(createdMerchant).toHaveProperty('loginIp');
|
|
|
- expect(createdMerchant).toHaveProperty('lastLoginTime');
|
|
|
- expect(createdMerchant).toHaveProperty('lastLoginIp');
|
|
|
-
|
|
|
- // 初始值应该为0或null
|
|
|
- expect(createdMerchant.loginNum).toBe(0);
|
|
|
- expect(createdMerchant.loginTime).toBe(0);
|
|
|
- expect(createdMerchant.lastLoginTime).toBe(0);
|
|
|
+ if (createResponse.status === 201) {
|
|
|
+ const createdMerchant = await createResponse.json();
|
|
|
+
|
|
|
+ // 验证登录统计字段存在
|
|
|
+ expect(createdMerchant).toHaveProperty('loginNum');
|
|
|
+ expect(createdMerchant).toHaveProperty('loginTime');
|
|
|
+ expect(createdMerchant).toHaveProperty('loginIp');
|
|
|
+ expect(createdMerchant).toHaveProperty('lastLoginTime');
|
|
|
+ expect(createdMerchant).toHaveProperty('lastLoginIp');
|
|
|
+
|
|
|
+ // 初始值应该为0或null
|
|
|
+ expect(createdMerchant.loginNum).toBe(0);
|
|
|
+ expect(createdMerchant.loginTime).toBe(0);
|
|
|
+ expect(createdMerchant.lastLoginTime).toBe(0);
|
|
|
+ }
|
|
|
});
|
|
|
});
|
|
|
});
|