This commit is contained in:
ryan
2026-07-13 15:08:40 +08:00
parent 08e8eea932
commit 1eff7878a1
441 changed files with 26491 additions and 18405 deletions
@@ -1,8 +1,8 @@
import {beforeEach, describe, expect, it, vi} from 'vitest';
import type {AxiosResponse} from 'axios';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import type { AxiosResponse } from 'axios';
import apiClient from '@/lib/services/core/api-client';
import {PagesService} from '@/lib/services/openflare/pages.service';
import { PagesService } from '@/lib/services/openflare/pages.service';
vi.mock('@/lib/services/core/api-client', () => ({
default: {
@@ -17,18 +17,18 @@ describe('PagesService', () => {
it('requests deployment files using the backend deployment route', async () => {
vi.mocked(apiClient.get).mockResolvedValue({
data: {error_msg: '', data: []},
data: { error_msg: '', data: [] },
status: 200,
statusText: 'OK',
headers: {},
config: {headers: {}},
config: { headers: {} },
} as AxiosResponse);
await PagesService.listDeploymentFiles(7);
expect(apiClient.get).toHaveBeenCalledWith(
'/api/v1/d/pages/deployments/7/files',
expect.objectContaining({params: undefined}),
expect.objectContaining({ params: undefined }),
);
});
});
+1 -1
View File
@@ -1 +1 @@
import '@testing-library/jest-dom/vitest'
import '@testing-library/jest-dom/vitest';
+48 -26
View File
@@ -1,17 +1,18 @@
import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
import {fireEvent, render, screen, waitFor} from '@testing-library/react';
import {createElement} from 'react';
import {beforeEach, describe, expect, it, vi} from 'vitest';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import { createElement } from 'react';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import {
reorderRuleIDs,
WafSection,
} from '@/app/(main)/proxy-routes/detail/components/waf-section';
import type {ProxyRouteItem, WAFRule} from '@/lib/services/openflare';
import {WafService} from '@/lib/services/openflare';
import type { ProxyRouteItem, WAFRule } from '@/lib/services/openflare';
import { WafService } from '@/lib/services/openflare';
vi.mock('@/lib/services/openflare', async (importOriginal) => {
const actual = await importOriginal<typeof import('@/lib/services/openflare')>();
const actual =
await importOriginal<typeof import('@/lib/services/openflare')>();
return {
...actual,
WafService: {
@@ -24,10 +25,22 @@ vi.mock('@/lib/services/openflare', async (importOriginal) => {
const graph = {
schema_version: 1,
nodes: [
{id: 'start', type: 'start' as const, position: {x: 0, y: 0}, config: {}},
{id: 'allow', type: 'allow' as const, position: {x: 100, y: 0}, config: {}},
{
id: 'start',
type: 'start' as const,
position: { x: 0, y: 0 },
config: {},
},
{
id: 'allow',
type: 'allow' as const,
position: { x: 100, y: 0 },
config: {},
},
],
edges: [
{ id: 'edge', source: 'start', source_handle: 'next', target: 'allow' },
],
edges: [{id: 'edge', source: 'start', source_handle: 'next', target: 'allow'}],
};
function rule(id: number, name: string, isGlobal = false): WAFRule {
@@ -64,13 +77,15 @@ describe('WAF route binding order', () => {
applied_rule_groups: [rule(1, '规则 A'), rule(2, '规则 B')],
applied_ids: [1, 2],
});
vi.mocked(WafService.updateSiteRuleGroups).mockImplementation(async (_routeID, ids) => ({
route_id: 9,
global_rule_group: rule(99, '全局规则', true),
rule_groups: [rule(1, '规则 A'), rule(2, '规则 B'), rule(3, '规则 C')],
applied_rule_groups: ids.map((id) => rule(id, `规则 ${id}`)),
applied_ids: ids,
}));
vi.mocked(WafService.updateSiteRuleGroups).mockImplementation(
async (_routeID, ids) => ({
route_id: 9,
global_rule_group: rule(99, '全局规则', true),
rule_groups: [rule(1, '规则 A'), rule(2, '规则 B'), rule(3, '规则 C')],
applied_rule_groups: ids.map((id) => rule(id, `规则 ${id}`)),
applied_ids: ids,
}),
);
});
it('reorders by the active and target IDs reported by drag end', () => {
@@ -78,26 +93,33 @@ describe('WAF route binding order', () => {
});
it('keeps the global rule fixed and submits custom rules in UI order', async () => {
const client = new QueryClient({defaultOptions: {queries: {retry: false}}});
const client = new QueryClient({
defaultOptions: { queries: { retry: false } },
});
render(
createElement(
QueryClientProvider,
{client},
createElement(WafSection, {route: {id: 9} as ProxyRouteItem}),
{ client },
createElement(WafSection, { route: { id: 9 } as ProxyRouteItem }),
),
);
expect(await screen.findByText('全局规则')).toBeInTheDocument();
expect(screen.getByText('始终生效')).toBeInTheDocument();
expect(screen.queryByRole('button', {name: '上移全局规则'})).not.toBeInTheDocument();
expect(
screen.queryByRole('button', { name: '上移全局规则' }),
).not.toBeInTheDocument();
fireEvent.click(screen.getByRole('checkbox', {name: '选择规则 C'}));
fireEvent.click(screen.getByRole('button', {name: '上移规则 C'}));
fireEvent.click(screen.getByRole('button', {name: '上移规则 C'}));
fireEvent.click(screen.getByRole('button', {name: '保存'}));
fireEvent.click(screen.getByRole('checkbox', { name: '选择规则 C' }));
fireEvent.click(screen.getByRole('button', { name: '上移规则 C' }));
fireEvent.click(screen.getByRole('button', { name: '上移规则 C' }));
fireEvent.click(screen.getByRole('button', { name: '保存' }));
await waitFor(() => {
expect(WafService.updateSiteRuleGroups).toHaveBeenCalledWith(9, [3, 1, 2]);
expect(WafService.updateSiteRuleGroups).toHaveBeenCalledWith(
9,
[3, 1, 2],
);
});
});
});
+41 -32
View File
@@ -1,19 +1,19 @@
import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
import {fireEvent, render, screen, waitFor} from '@testing-library/react';
import type {AxiosResponse} from 'axios';
import {createElement} from 'react';
import {beforeEach, describe, expect, it, vi} from 'vitest';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
import type { AxiosResponse } from 'axios';
import { createElement } from 'react';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import WafPage from '@/app/(main)/waf/page';
import apiClient from '@/lib/services/core/api-client';
import {WafService} from '@/lib/services/openflare';
import type {WAFSiteRuleGroups} from '@/lib/services/openflare';
import {WafService as DirectWafService} from '@/lib/services/openflare/waf.service';
import { WafService } from '@/lib/services/openflare';
import type { WAFSiteRuleGroups } from '@/lib/services/openflare';
import { WafService as DirectWafService } from '@/lib/services/openflare/waf.service';
const pushMock = vi.fn();
vi.mock('next/navigation', () => ({
useRouter: () => ({push: pushMock}),
useRouter: () => ({ push: pushMock }),
}));
vi.mock('@/lib/services/core/api-client', () => ({
@@ -23,7 +23,8 @@ vi.mock('@/lib/services/core/api-client', () => ({
}));
vi.mock('@/lib/services/openflare', async (importOriginal) => {
const actual = await importOriginal<typeof import('@/lib/services/openflare')>();
const actual =
await importOriginal<typeof import('@/lib/services/openflare')>();
return {
...actual,
WafService: {
@@ -39,10 +40,22 @@ vi.mock('@/lib/services/openflare', async (importOriginal) => {
const graph = {
schema_version: 1,
nodes: [
{id: 'start', type: 'start' as const, position: {x: 0, y: 0}, config: {}},
{id: 'allow', type: 'allow' as const, position: {x: 200, y: 0}, config: {}},
{
id: 'start',
type: 'start' as const,
position: { x: 0, y: 0 },
config: {},
},
{
id: 'allow',
type: 'allow' as const,
position: { x: 200, y: 0 },
config: {},
},
],
edges: [
{ id: 'edge', source: 'start', source_handle: 'next', target: 'allow' },
],
edges: [{id: 'edge', source: 'start', source_handle: 'next', target: 'allow'}],
};
const ruleSummary = {
@@ -79,35 +92,35 @@ describe('WafService rule graph API', () => {
it('creates a rule with a name-only payload', async () => {
vi.mocked(apiClient.post).mockResolvedValue({
data: {error_msg: '', data: {id: 17, name: '入口防护', graph}},
data: { error_msg: '', data: { id: 17, name: '入口防护', graph } },
} as AxiosResponse);
await DirectWafService.createRule({name: '入口防护'});
await DirectWafService.createRule({ name: '入口防护' });
expect(apiClient.post).toHaveBeenCalledWith(
'/api/v1/d/waf/rule-groups',
{name: '入口防护'},
{ name: '入口防护' },
undefined,
);
});
it('saves the graph together with its current revision', async () => {
vi.mocked(apiClient.post).mockResolvedValue({
data: {error_msg: '', data: {id: 17, revision: 4, graph}},
data: { error_msg: '', data: { id: 17, revision: 4, graph } },
} as AxiosResponse);
await DirectWafService.saveRuleGraph(17, {revision: 3, graph});
await DirectWafService.saveRuleGraph(17, { revision: 3, graph });
expect(apiClient.post).toHaveBeenCalledWith(
'/api/v1/d/waf/rule-groups/17/graph',
{revision: 3, graph},
{ revision: 3, graph },
undefined,
);
});
it('updates rule metadata with the current name and enabled state', async () => {
vi.mocked(apiClient.post).mockResolvedValue({
data: {error_msg: '', data: {...ruleSummary, enabled: true}},
data: { error_msg: '', data: { ...ruleSummary, enabled: true } },
} as AxiosResponse);
await DirectWafService.updateRuleMeta(17, {
@@ -117,7 +130,7 @@ describe('WafService rule graph API', () => {
expect(apiClient.post).toHaveBeenCalledWith(
'/api/v1/d/waf/rule-groups/17/meta',
{name: '入口防护', enabled: true},
{ name: '入口防护', enabled: true },
undefined,
);
});
@@ -140,25 +153,21 @@ describe('WAF rule creation flow', () => {
it('creates by name and navigates directly to the graph editor', async () => {
const client = new QueryClient({
defaultOptions: {queries: {retry: false, gcTime: 0}},
defaultOptions: { queries: { retry: false, gcTime: 0 } },
});
render(
createElement(
QueryClientProvider,
{client},
createElement(WafPage),
),
createElement(QueryClientProvider, { client }, createElement(WafPage)),
);
fireEvent.click(await screen.findByRole('button', {name: '新建规则'}));
fireEvent.click(await screen.findByRole('button', { name: '新建规则' }));
expect(screen.queryByText('IP 白名单')).not.toBeInTheDocument();
fireEvent.change(screen.getByRole('textbox', {name: '规则名称'}), {
target: {value: '入口防护'},
fireEvent.change(screen.getByRole('textbox', { name: '规则名称' }), {
target: { value: '入口防护' },
});
fireEvent.click(screen.getByRole('button', {name: '创建并编排'}));
fireEvent.click(screen.getByRole('button', { name: '创建并编排' }));
await waitFor(() => {
expect(WafService.createRule).toHaveBeenCalledWith({name: '入口防护'});
expect(WafService.createRule).toHaveBeenCalledWith({ name: '入口防护' });
expect(pushMock).toHaveBeenCalledWith('/waf/rules/editor?id=17');
});
});
@@ -1,6 +1,6 @@
import {describe, expect, it} from 'vitest';
import { describe, expect, it } from 'vitest';
import {resolveZoneDomainInput} from '@/app/(main)/websites/components/resolve-zone-domain-input';
import { resolveZoneDomainInput } from '@/app/(main)/websites/components/resolve-zone-domain-input';
describe('resolveZoneDomainInput', () => {
it('maps short label and apex @ under zone root', () => {
@@ -13,7 +13,9 @@ describe('resolveZoneDomainInput', () => {
});
it('accepts full FQDN under the zone', () => {
expect(resolveZoneDomainInput('www.api.example.com', 'example.com')).toEqual({
expect(
resolveZoneDomainInput('www.api.example.com', 'example.com'),
).toEqual({
domain: 'www.api.example.com',
});
expect(resolveZoneDomainInput('example.com', 'example.com')).toEqual({
@@ -22,7 +24,11 @@ describe('resolveZoneDomainInput', () => {
});
it('rejects foreign domains and wildcards', () => {
expect(resolveZoneDomainInput('evil.com', 'example.com').error).toBeTruthy();
expect(resolveZoneDomainInput('*.example.com', 'example.com').error).toBeTruthy();
expect(
resolveZoneDomainInput('evil.com', 'example.com').error,
).toBeTruthy();
expect(
resolveZoneDomainInput('*.example.com', 'example.com').error,
).toBeTruthy();
});
});
+21 -14
View File
@@ -1,27 +1,34 @@
import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
import {fireEvent, render, screen} from '@testing-library/react';
import {describe, expect, it, vi} from 'vitest';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { fireEvent, render, screen } from '@testing-library/react';
import { describe, expect, it, vi } from 'vitest';
import WebsitesPage from '@/app/(main)/websites/page';
import {ZoneService} from '@/lib/services/openflare';
import { ZoneService } from '@/lib/services/openflare';
vi.mock('next/link', () => ({
default: ({children, href}: {children: React.ReactNode; href: string}) => (
<a href={href}>{children}</a>
),
default: ({
children,
href,
}: {
children: React.ReactNode;
href: string;
}) => <a href={href}>{children}</a>,
}));
vi.mock('next/navigation', () => ({
useRouter: () => ({push: vi.fn()}),
useRouter: () => ({ push: vi.fn() }),
}));
vi.mock('@/lib/services/openflare', async (importOriginal) => {
const actual = await importOriginal<typeof import('@/lib/services/openflare')>();
return {...actual, ZoneService: {list: vi.fn()}};
const actual =
await importOriginal<typeof import('@/lib/services/openflare')>();
return { ...actual, ZoneService: { list: vi.fn() } };
});
function renderPage() {
const client = new QueryClient({defaultOptions: {queries: {retry: false}}});
const client = new QueryClient({
defaultOptions: { queries: { retry: false } },
});
return render(
<QueryClientProvider client={client}>
<WebsitesPage />
@@ -53,12 +60,12 @@ describe('WebsitesPage', () => {
expect(await screen.findByText('example.com')).toBeVisible();
expect(screen.getByText('3')).toBeVisible();
expect(screen.getByText('0')).toBeVisible();
expect(screen.getByRole('columnheader', {name: '根域'})).toBeVisible();
expect(screen.getByRole('columnheader', { name: '根域' })).toBeVisible();
fireEvent.change(screen.getByPlaceholderText('搜索 Zone 根域'), {
target: {value: 'example'},
target: { value: 'example' },
});
expect(screen.getByRole('link', {name: '管理'})).toHaveAttribute(
expect(screen.getByRole('link', { name: '管理' })).toHaveAttribute(
'href',
'/websites/42',
);
@@ -1,19 +1,23 @@
import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
import {render, screen} from '@testing-library/react';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { render, screen } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import {describe, expect, it, vi} from 'vitest';
import { describe, expect, it, vi } from 'vitest';
import {ZoneDomainSelector} from '@/app/(main)/proxy-routes/components/zone-domain-selector';
import type {ZoneDomainItem, ZoneItem} from '@/lib/services/openflare';
import { ZoneDomainSelector } from '@/app/(main)/proxy-routes/components/zone-domain-selector';
import type { ZoneDomainItem, ZoneItem } from '@/lib/services/openflare';
vi.mock('next/link', () => ({
default: ({children, href}: {children: React.ReactNode; href: string}) => (
<a href={href}>{children}</a>
),
default: ({
children,
href,
}: {
children: React.ReactNode;
href: string;
}) => <a href={href}>{children}</a>,
}));
const zones: ZoneItem[] = [
{id: 1, domain: 'example.com', created_at: '', updated_at: ''},
{ id: 1, domain: 'example.com', created_at: '', updated_at: '' },
];
const domains: ZoneDomainItem[] = [
@@ -38,8 +42,12 @@ const domains: ZoneDomainItem[] = [
];
function renderSelector(ui: React.ReactElement) {
const client = new QueryClient({defaultOptions: {queries: {retry: false}}});
return render(<QueryClientProvider client={client}>{ui}</QueryClientProvider>);
const client = new QueryClient({
defaultOptions: { queries: { retry: false } },
});
return render(
<QueryClientProvider client={client}>{ui}</QueryClientProvider>,
);
}
describe('ZoneDomainSelector', () => {
@@ -59,7 +67,7 @@ describe('ZoneDomainSelector', () => {
expect(screen.getByText('api.example.com')).toBeVisible();
// Bound to another route — hidden by default
expect(screen.queryByText('bound.example.com')).not.toBeInTheDocument();
expect(screen.getByRole('button', {name: /快捷新增域名/})).toBeVisible();
expect(screen.getByRole('button', { name: /快捷新增域名/ })).toBeVisible();
await user.click(screen.getByText('api.example.com'));
expect(onChange).toHaveBeenCalledWith([]);
+33 -20
View File
@@ -1,9 +1,13 @@
import {QueryClient, QueryClientProvider} from '@tanstack/react-query';
import {render, screen, waitFor} from '@testing-library/react';
import {beforeEach, describe, expect, it, vi} from 'vitest';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { render, screen, waitFor } from '@testing-library/react';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import {ZonePageClient} from '@/app/(main)/websites/[zoneId]/page-client';
import {ProxyRouteService, TlsCertificateService, ZoneService} from '@/lib/services/openflare';
import { ZonePageClient } from '@/app/(main)/websites/[zoneId]/page-client';
import {
ProxyRouteService,
TlsCertificateService,
ZoneService,
} from '@/lib/services/openflare';
class ResizeObserverMock {
observe() {}
@@ -19,20 +23,25 @@ let mockParamZoneId = '42';
const replaceMock = vi.fn();
vi.mock('next/link', () => ({
default: ({children, href}: {children: React.ReactNode; href: string}) => (
<a href={href}>{children}</a>
),
default: ({
children,
href,
}: {
children: React.ReactNode;
href: string;
}) => <a href={href}>{children}</a>,
}));
vi.mock('next/navigation', () => ({
useRouter: () => ({replace: replaceMock, back: vi.fn()}),
useRouter: () => ({ replace: replaceMock, back: vi.fn() }),
usePathname: () => `/websites/${mockZoneId}`,
useSearchParams: () => new URLSearchParams(),
useParams: () => ({zoneId: mockParamZoneId}),
useParams: () => ({ zoneId: mockParamZoneId }),
}));
vi.mock('@/lib/services/openflare', async (importOriginal) => {
const actual = await importOriginal<typeof import('@/lib/services/openflare')>();
const actual =
await importOriginal<typeof import('@/lib/services/openflare')>();
return {
...actual,
ZoneService: {
@@ -55,7 +64,7 @@ function renderPage(zoneId: number, paramZoneId = zoneId) {
mockParamZoneId = String(paramZoneId);
const client = new QueryClient({
defaultOptions: {
queries: {retry: false, gcTime: 0},
queries: { retry: false, gcTime: 0 },
},
});
return render(
@@ -92,7 +101,7 @@ describe('ZonePageClient', () => {
it('loads the overview by stable ID and exposes all tabs including empty domains', async () => {
vi.mocked(ZoneService.getOverview).mockImplementation(async () => ({
zone: {id: 42, domain: 'example.com', created_at: '', updated_at: ''},
zone: { id: 42, domain: 'example.com', created_at: '', updated_at: '' },
domains: [],
}));
@@ -101,19 +110,21 @@ describe('ZonePageClient', () => {
await waitFor(() => {
expect(ZoneService.getOverview).toHaveBeenCalledWith(42);
});
expect(await screen.findByRole('heading', {name: 'example.com'})).toBeVisible();
expect(
await screen.findByRole('heading', { name: 'example.com' }),
).toBeVisible();
expect(await screen.findByText('唯一访问者')).toBeVisible();
expect(screen.getByText('请求总数')).toBeVisible();
expect(screen.getByText('已提供的数据总计')).toBeVisible();
expect(screen.getByRole('tab', {name: '域名 (0)'})).toBeVisible();
expect(screen.getByRole('tab', {name: '证书 (0)'})).toBeVisible();
expect(screen.queryByRole('tab', {name: '路由'})).not.toBeInTheDocument();
expect(screen.getByRole('tab', {name: '设置'})).toBeVisible();
expect(screen.getByRole('tab', { name: '域名 (0)' })).toBeVisible();
expect(screen.getByRole('tab', { name: '证书 (0)' })).toBeVisible();
expect(screen.queryByRole('tab', { name: '路由' })).not.toBeInTheDocument();
expect(screen.getByRole('tab', { name: '设置' })).toBeVisible();
});
it('uses the browser pathname ID when serving a static-export fallback shell', async () => {
vi.mocked(ZoneService.getOverview).mockImplementation(async () => ({
zone: {id: 42, domain: 'example.com', created_at: '', updated_at: ''},
zone: { id: 42, domain: 'example.com', created_at: '', updated_at: '' },
domains: [],
}));
@@ -126,7 +137,9 @@ describe('ZonePageClient', () => {
});
it('renders a not-found state for a missing Zone', async () => {
vi.mocked(ZoneService.getOverview).mockRejectedValue(new Error('Zone 不存在'));
vi.mocked(ZoneService.getOverview).mockRejectedValue(
new Error('Zone 不存在'),
);
renderPage(42);