Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3f2b2585b8 |
@@ -126,7 +126,34 @@ describe('StorageCleaner 页面', () => {
|
|||||||
|
|
||||||
await waitFor(() => {
|
await waitFor(() => {
|
||||||
expect(clearStorage).not.toHaveBeenCalled();
|
expect(clearStorage).not.toHaveBeenCalled();
|
||||||
expect(toast.warning).toHaveBeenCalledWith('当前标签页已切换,请等待数据刷新后再清理');
|
expect(toast.warning).toHaveBeenCalledWith('当前页面已变更,请等待数据刷新后再清理');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('同一标签页 URL 变更后、数据刷新完成前不应执行清理', async () => {
|
||||||
|
let currentUrl = 'https://a.example.com';
|
||||||
|
vi.mocked(getCurrentTab).mockImplementation(
|
||||||
|
async () =>
|
||||||
|
({
|
||||||
|
id: 1,
|
||||||
|
url: currentUrl,
|
||||||
|
}) as any,
|
||||||
|
);
|
||||||
|
|
||||||
|
render(<Index />);
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.getByRole('button', { name: /立即清理/ })).not.toBeDisabled();
|
||||||
|
});
|
||||||
|
|
||||||
|
currentUrl = 'https://b.example.com';
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: /立即清理/ }));
|
||||||
|
fireEvent.click(screen.getByRole('button', { name: /确认清理/ }));
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(clearStorage).not.toHaveBeenCalled();
|
||||||
|
expect(toast.warning).toHaveBeenCalledWith('当前页面已变更,请等待数据刷新后再清理');
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -258,8 +258,8 @@ export function useStorageCleaner(): UseStorageCleanerReturn {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const boundTab = boundTabRef.current;
|
const boundTab = boundTabRef.current;
|
||||||
if (!boundTab || boundTab.id !== tab.id) {
|
if (!boundTab || boundTab.id !== tab.id || boundTab.url !== tab.url) {
|
||||||
toast.warning('当前标签页已切换,请等待数据刷新后再清理');
|
toast.warning('当前页面已变更,请等待数据刷新后再清理');
|
||||||
setShowConfirm(false);
|
setShowConfirm(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -234,38 +234,29 @@ export default function FieldList({
|
|||||||
if (!ruleName.trim()) return;
|
if (!ruleName.trim()) return;
|
||||||
|
|
||||||
const trimmedName = ruleName.trim();
|
const trimmedName = ruleName.trim();
|
||||||
const existingRule = ruleStorage.getByName(trimmedName);
|
|
||||||
|
|
||||||
// 检查名称是否重复
|
// 检查名称是否重复
|
||||||
if (!overwrite && existingRule) {
|
if (!overwrite) {
|
||||||
|
const existingRule = ruleStorage.getByName(trimmedName);
|
||||||
|
if (existingRule) {
|
||||||
setShowConfirmOverwrite(true);
|
setShowConfirmOverwrite(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const savedRule = ruleStorage.save(
|
|
||||||
overwrite && existingRule
|
|
||||||
? {
|
|
||||||
id: existingRule.id,
|
|
||||||
name: trimmedName,
|
|
||||||
description: ruleDescription.trim(),
|
|
||||||
fields: fields,
|
|
||||||
}
|
}
|
||||||
: {
|
|
||||||
|
const newRule = ruleStorage.save({
|
||||||
name: trimmedName,
|
name: trimmedName,
|
||||||
description: ruleDescription.trim(),
|
description: ruleDescription.trim(),
|
||||||
fields: fields,
|
fields: fields,
|
||||||
},
|
});
|
||||||
);
|
|
||||||
|
|
||||||
if (savedRule) {
|
if (newRule) {
|
||||||
setShowSaveDialog(false);
|
setShowSaveDialog(false);
|
||||||
setShowConfirmOverwrite(false);
|
setShowConfirmOverwrite(false);
|
||||||
setRuleName('');
|
setRuleName('');
|
||||||
setRuleDescription('');
|
setRuleDescription('');
|
||||||
toast.success(overwrite ? '规则已覆盖' : '规则已保存');
|
toast.success('规则已保存');
|
||||||
onRuleSaved?.();
|
onRuleSaved?.();
|
||||||
} else {
|
|
||||||
toast.error('规则保存失败');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[ruleName, ruleDescription, fields, onRuleSaved],
|
[ruleName, ruleDescription, fields, onRuleSaved],
|
||||||
|
|||||||
@@ -1,92 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
||||||
import { render, screen } from '@testing-library/react';
|
|
||||||
import userEvent from '@testing-library/user-event';
|
|
||||||
import type { FieldConfig } from '@/types/testDataGenerator';
|
|
||||||
|
|
||||||
vi.mock('@/utils/ruleStorage', () => ({
|
|
||||||
getByName: vi.fn(),
|
|
||||||
save: vi.fn(),
|
|
||||||
update: vi.fn(),
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock('sonner', () => ({
|
|
||||||
toast: {
|
|
||||||
success: vi.fn(),
|
|
||||||
error: vi.fn(),
|
|
||||||
},
|
|
||||||
}));
|
|
||||||
|
|
||||||
import FieldList from '../FieldList';
|
|
||||||
import * as ruleStorage from '@/utils/ruleStorage';
|
|
||||||
import { toast } from 'sonner';
|
|
||||||
|
|
||||||
const mockedRuleStorage = vi.mocked(ruleStorage);
|
|
||||||
const mockedToast = vi.mocked(toast);
|
|
||||||
|
|
||||||
const mockFields: FieldConfig[] = [
|
|
||||||
{
|
|
||||||
id: 'field-1',
|
|
||||||
name: 'username',
|
|
||||||
generatorId: 'string',
|
|
||||||
params: {},
|
|
||||||
required: true,
|
|
||||||
nullRate: 0,
|
|
||||||
unique: false,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
const defaultProps = {
|
|
||||||
fields: mockFields,
|
|
||||||
onUpdate: vi.fn(),
|
|
||||||
onRemove: vi.fn(),
|
|
||||||
onAdd: vi.fn(),
|
|
||||||
onEdit: vi.fn(),
|
|
||||||
onReorder: vi.fn(),
|
|
||||||
};
|
|
||||||
|
|
||||||
describe('FieldList 规则保存', () => {
|
|
||||||
beforeEach(() => {
|
|
||||||
vi.clearAllMocks();
|
|
||||||
mockedRuleStorage.getByName.mockReturnValue(undefined);
|
|
||||||
mockedRuleStorage.save.mockReturnValue({
|
|
||||||
id: 'rule-1',
|
|
||||||
name: 'My Rule',
|
|
||||||
fields: mockFields,
|
|
||||||
createdAt: Date.now(),
|
|
||||||
updatedAt: Date.now(),
|
|
||||||
useCount: 0,
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
it('覆盖同名规则时应更新已有规则而非新建', async () => {
|
|
||||||
const user = userEvent.setup();
|
|
||||||
const existingRule = {
|
|
||||||
id: 'existing-rule-id',
|
|
||||||
name: 'My Rule',
|
|
||||||
fields: mockFields,
|
|
||||||
createdAt: Date.now(),
|
|
||||||
updatedAt: Date.now(),
|
|
||||||
useCount: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
mockedRuleStorage.getByName.mockReturnValue(existingRule);
|
|
||||||
|
|
||||||
render(<FieldList {...defaultProps} />);
|
|
||||||
|
|
||||||
await user.click(screen.getByRole('button', { name: /保存规则/ }));
|
|
||||||
await user.type(screen.getByPlaceholderText('规则名称'), 'My Rule');
|
|
||||||
await user.click(screen.getByRole('button', { name: '确认' }));
|
|
||||||
|
|
||||||
expect(screen.getByText('已存在同名规则,是否覆盖保存?')).toBeInTheDocument();
|
|
||||||
|
|
||||||
await user.click(screen.getByRole('button', { name: '覆盖' }));
|
|
||||||
|
|
||||||
expect(mockedRuleStorage.save).toHaveBeenCalledWith({
|
|
||||||
id: 'existing-rule-id',
|
|
||||||
name: 'My Rule',
|
|
||||||
description: '',
|
|
||||||
fields: mockFields,
|
|
||||||
});
|
|
||||||
expect(mockedToast.success).toHaveBeenCalledWith('规则已覆盖');
|
|
||||||
});
|
|
||||||
});
|
|
||||||
@@ -48,27 +48,6 @@ describe('ruleStorage', () => {
|
|||||||
expect(updated).toBeNull();
|
expect(updated).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('save 带 id 时应更新已有规则而非新建', () => {
|
|
||||||
const first = ruleStorage.save({
|
|
||||||
name: 'Test Rule',
|
|
||||||
fields: [mockField],
|
|
||||||
});
|
|
||||||
expect(first).not.toBeNull();
|
|
||||||
|
|
||||||
const updatedField = { ...mockField, name: 'email' };
|
|
||||||
const updated = ruleStorage.save({
|
|
||||||
id: first!.id,
|
|
||||||
name: 'Test Rule',
|
|
||||||
description: 'Updated',
|
|
||||||
fields: [updatedField],
|
|
||||||
});
|
|
||||||
|
|
||||||
expect(updated).not.toBeNull();
|
|
||||||
expect(ruleStorage.getCount()).toBe(1);
|
|
||||||
expect(ruleStorage.getById(first!.id)?.fields[0].name).toBe('email');
|
|
||||||
expect(ruleStorage.getById(first!.id)?.description).toBe('Updated');
|
|
||||||
});
|
|
||||||
|
|
||||||
it('deleteRule 在 localStorage 写入失败时应返回 false', () => {
|
it('deleteRule 在 localStorage 写入失败时应返回 false', () => {
|
||||||
const saved = ruleStorage.save({
|
const saved = ruleStorage.save({
|
||||||
name: 'Test Rule',
|
name: 'Test Rule',
|
||||||
|
|||||||
Reference in New Issue
Block a user