fix: increase memory limit for vitest and improve test stability
- Updated test scripts in package.json to set NODE_OPTIONS for increased memory limit. - Added safety checks for remote servers and domains in ProxyHostForm component to prevent errors. - Refactored Notifications tests to remove unnecessary use of fake timers and improve clarity. - Updated ProxyHosts extra tests to specify button names for better accessibility. - Enhanced Security functional tests by centralizing translation strings and improving mock implementations. - Adjusted test setup to suppress specific console errors related to act() warnings. - Modified vitest configuration to limit worker usage and prevent memory issues during testing.
This commit is contained in:
@@ -243,7 +243,9 @@ export default function ProxyHostForm({ host, onSubmit, onCancel }: ProxyHostFor
|
||||
}
|
||||
|
||||
const { servers: remoteServers } = useRemoteServers()
|
||||
const safeRemoteServers = Array.isArray(remoteServers) ? remoteServers : []
|
||||
const { domains, createDomain } = useDomains()
|
||||
const safeDomains = Array.isArray(domains) ? domains : []
|
||||
const { certificates } = useCertificates()
|
||||
const { data: securityProfiles } = useSecurityHeaderProfiles()
|
||||
|
||||
@@ -307,7 +309,7 @@ export default function ProxyHostForm({ host, onSubmit, onCancel }: ProxyHostFor
|
||||
if (parsed.domain && parsed.domain !== domain) {
|
||||
// It's a subdomain, check if the base domain exists
|
||||
const baseDomain = parsed.domain
|
||||
const exists = domains.some(d => d.name === baseDomain)
|
||||
const exists = safeDomains.some(d => d.name === baseDomain)
|
||||
if (!exists) {
|
||||
setPendingDomain(baseDomain)
|
||||
setShowDomainPrompt(true)
|
||||
@@ -315,7 +317,7 @@ export default function ProxyHostForm({ host, onSubmit, onCancel }: ProxyHostFor
|
||||
}
|
||||
} else if (parsed.domain && parsed.domain === domain) {
|
||||
// It is a base domain, check if it exists
|
||||
const exists = domains.some(d => d.name === domain)
|
||||
const exists = safeDomains.some(d => d.name === domain)
|
||||
if (!exists) {
|
||||
setPendingDomain(domain)
|
||||
setShowDomainPrompt(true)
|
||||
@@ -475,7 +477,7 @@ export default function ProxyHostForm({ host, onSubmit, onCancel }: ProxyHostFor
|
||||
|
||||
// If using a Remote Server, try to use the Host IP and Mapped Public Port
|
||||
if (connectionSource !== 'local' && connectionSource !== 'custom') {
|
||||
const server = remoteServers.find(s => s.uuid === connectionSource)
|
||||
const server = safeRemoteServers.find(s => s.uuid === connectionSource)
|
||||
if (server) {
|
||||
// Use the Remote Server's Host IP (e.g. public/tailscale IP)
|
||||
host = server.host
|
||||
@@ -603,7 +605,7 @@ export default function ProxyHostForm({ host, onSubmit, onCancel }: ProxyHostFor
|
||||
<SelectContent>
|
||||
<SelectItem value="custom">Custom / Manual</SelectItem>
|
||||
<SelectItem value="local">Local (Docker Socket)</SelectItem>
|
||||
{remoteServers
|
||||
{safeRemoteServers
|
||||
.filter(s => s.provider === 'docker' && s.enabled)
|
||||
.map(server => (
|
||||
<SelectItem key={server.uuid} value={server.uuid}>
|
||||
@@ -660,7 +662,7 @@ export default function ProxyHostForm({ host, onSubmit, onCancel }: ProxyHostFor
|
||||
|
||||
{/* Domain Names */}
|
||||
<div className="space-y-4">
|
||||
{domains.length > 0 && (
|
||||
{safeDomains.length > 0 && (
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-300 mb-2">
|
||||
Base Domain (Auto-fill)
|
||||
@@ -670,7 +672,7 @@ export default function ProxyHostForm({ host, onSubmit, onCancel }: ProxyHostFor
|
||||
<SelectValue placeholder="Select a base domain" />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{domains.map(domain => (
|
||||
{safeDomains.map(domain => (
|
||||
<SelectItem key={domain.uuid} value={domain.name}>
|
||||
{domain.name}
|
||||
</SelectItem>
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
|
||||
import { screen, waitFor, within } from '@testing-library/react'
|
||||
import userEvent from '@testing-library/user-event'
|
||||
import { act } from 'react'
|
||||
import Notifications from '../Notifications'
|
||||
import { renderWithQueryClient } from '../../test-utils/renderWithQueryClient'
|
||||
import * as notificationsApi from '../../api/notifications'
|
||||
@@ -131,10 +130,9 @@ describe('Notifications', () => {
|
||||
})
|
||||
|
||||
it('shows and hides the update indicator after save', async () => {
|
||||
vi.useFakeTimers()
|
||||
setupMocks([baseProvider])
|
||||
|
||||
const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
|
||||
const user = userEvent.setup()
|
||||
renderWithQueryClient(<Notifications />)
|
||||
|
||||
const row = await screen.findByTestId(`provider-row-${baseProvider.id}`)
|
||||
@@ -143,28 +141,24 @@ describe('Notifications', () => {
|
||||
|
||||
await user.click(screen.getByTestId('provider-save-btn'))
|
||||
|
||||
await act(async () => {
|
||||
await vi.advanceTimersByTimeAsync(0)
|
||||
})
|
||||
|
||||
expect(notificationsApi.updateProvider).toHaveBeenCalled()
|
||||
|
||||
expect(screen.getByTestId(`provider-update-indicator-${baseProvider.id}`)).toBeInTheDocument()
|
||||
expect(toast.success).toHaveBeenCalledWith('common.saved')
|
||||
|
||||
await act(async () => {
|
||||
await vi.advanceTimersByTimeAsync(3000)
|
||||
})
|
||||
|
||||
expect(screen.queryByTestId(`provider-update-indicator-${baseProvider.id}`)).toBeNull()
|
||||
await waitFor(
|
||||
() => {
|
||||
expect(screen.queryByTestId(`provider-update-indicator-${baseProvider.id}`)).toBeNull()
|
||||
},
|
||||
{ timeout: 4000 },
|
||||
)
|
||||
})
|
||||
|
||||
it('cleans up the update indicator timer on unmount', async () => {
|
||||
vi.useFakeTimers()
|
||||
setupMocks([baseProvider])
|
||||
|
||||
const clearTimeoutSpy = vi.spyOn(window, 'clearTimeout')
|
||||
const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
|
||||
const user = userEvent.setup()
|
||||
const { unmount } = renderWithQueryClient(<Notifications />)
|
||||
|
||||
const row = await screen.findByTestId(`provider-row-${baseProvider.id}`)
|
||||
@@ -173,10 +167,6 @@ describe('Notifications', () => {
|
||||
|
||||
await user.click(screen.getByTestId('provider-save-btn'))
|
||||
|
||||
await act(async () => {
|
||||
await vi.advanceTimersByTimeAsync(0)
|
||||
})
|
||||
|
||||
expect(notificationsApi.updateProvider).toHaveBeenCalled()
|
||||
expect(screen.getByTestId(`provider-update-indicator-${baseProvider.id}`)).toBeInTheDocument()
|
||||
unmount()
|
||||
|
||||
@@ -164,7 +164,7 @@ describe('ProxyHosts page extra tests', () => {
|
||||
renderWithProviders(<ProxyHosts />)
|
||||
|
||||
await waitFor(() => expect(screen.getByText('DelHost')).toBeInTheDocument())
|
||||
const deleteBtn = screen.getByRole('button', { name: 'Delete' })
|
||||
const deleteBtn = screen.getByRole('button', { name: 'Delete proxy host DelHost' })
|
||||
await userEvent.click(deleteBtn)
|
||||
|
||||
// Confirm deletion in the dialog
|
||||
|
||||
@@ -36,78 +36,79 @@ vi.mock('../../hooks/useNotifications', () => ({
|
||||
})),
|
||||
}))
|
||||
|
||||
const securityTranslations: Record<string, string> = {
|
||||
'security.title': 'Security',
|
||||
'security.description': 'Configure security layers for your reverse proxy',
|
||||
'security.cerberusDashboard': 'Cerberus Dashboard',
|
||||
'security.cerberusActive': 'Active',
|
||||
'security.cerberusDisabled': 'Disabled',
|
||||
'security.cerberusReadyMessage': 'Cerberus is ready to protect your services',
|
||||
'security.cerberusDisabledMessage': 'Enable Cerberus in System Settings to activate security features',
|
||||
'security.featuresUnavailable': 'Security Features Unavailable',
|
||||
'security.featuresUnavailableMessage': 'Enable Cerberus in System Settings to use security features',
|
||||
'security.learnMore': 'Learn More',
|
||||
'security.adminWhitelist': 'Admin Whitelist',
|
||||
'security.adminWhitelistDescription': 'CIDRs that bypass security checks for admin access',
|
||||
'security.commaSeparatedCIDR': 'Comma-separated CIDRs (e.g., 192.168.1.0/24)',
|
||||
'security.generateToken': 'Generate Token',
|
||||
'security.generateTokenTooltip': 'Generate a one-time break-glass token for emergency access',
|
||||
'security.layer1': 'Layer 1',
|
||||
'security.layer2': 'Layer 2',
|
||||
'security.layer3': 'Layer 3',
|
||||
'security.layer4': 'Layer 4',
|
||||
'security.ids': 'IDS',
|
||||
'security.acl': 'ACL',
|
||||
'security.waf': 'WAF',
|
||||
'security.rate': 'Rate',
|
||||
'security.crowdsec': 'CrowdSec',
|
||||
'security.crowdsecDescription': 'IP Reputation',
|
||||
'security.crowdsecProtects': 'Blocks known attackers, botnets, and malicious IPs',
|
||||
'security.crowdsecDisabledDescription': 'Enable to block known malicious IPs',
|
||||
'security.accessControl': 'Access Control',
|
||||
'security.aclDescription': 'IP Allowlists/Blocklists',
|
||||
'security.aclProtects': 'Unauthorized IPs, geo-based attacks',
|
||||
'security.corazaWaf': 'Coraza WAF',
|
||||
'security.wafDescription': 'Request Inspection',
|
||||
'security.wafProtects': 'SQL injection, XSS, RCE',
|
||||
'security.wafDisabledDescription': 'Enable to inspect requests for threats',
|
||||
'security.rateLimiting': 'Rate Limiting',
|
||||
'security.rateLimitDescription': 'Volume Control',
|
||||
'security.rateLimitProtects': 'DDoS attacks, credential stuffing',
|
||||
'security.processStopped': 'Process stopped',
|
||||
'security.enableCerberusFirst': 'Enable Cerberus first',
|
||||
'security.toggleCrowdsec': 'Toggle CrowdSec',
|
||||
'security.toggleAcl': 'Toggle Access Control',
|
||||
'security.toggleWaf': 'Toggle WAF',
|
||||
'security.toggleRateLimit': 'Toggle Rate Limiting',
|
||||
'security.manageLists': 'Manage Lists',
|
||||
'security.auditLogs': 'Audit Logs',
|
||||
'security.notifications': 'Notifications',
|
||||
'security.threeHeadsTurn': 'Three heads turn',
|
||||
'security.cerberusConfigUpdating': 'Cerberus configuration updating',
|
||||
'security.summoningGuardian': 'Summoning the guardian',
|
||||
'security.crowdsecStarting': 'CrowdSec is starting',
|
||||
'security.guardianRests': 'Guardian rests',
|
||||
'security.crowdsecStopping': 'CrowdSec is stopping',
|
||||
'security.strengtheningGuard': 'Strengthening guard',
|
||||
'security.wardsActivating': 'Wards activating',
|
||||
'common.enabled': 'Enabled',
|
||||
'common.disabled': 'Disabled',
|
||||
'common.save': 'Save',
|
||||
'common.configure': 'Configure',
|
||||
'common.docs': 'Docs',
|
||||
'common.error': 'Error',
|
||||
'security.failedToLoadConfiguration': 'Failed to load security configuration',
|
||||
}
|
||||
|
||||
// Mock i18n translation
|
||||
vi.mock('react-i18next', () => ({
|
||||
useTranslation: () => ({
|
||||
t: (key: string, options?: { pid?: number }) => {
|
||||
const translations: Record<string, string> = {
|
||||
'security.title': 'Security',
|
||||
'security.description': 'Configure security layers for your reverse proxy',
|
||||
'security.cerberusDashboard': 'Cerberus Dashboard',
|
||||
'security.cerberusActive': 'Active',
|
||||
'security.cerberusDisabled': 'Disabled',
|
||||
'security.cerberusReadyMessage': 'Cerberus is ready to protect your services',
|
||||
'security.cerberusDisabledMessage': 'Enable Cerberus in System Settings to activate security features',
|
||||
'security.featuresUnavailable': 'Security Features Unavailable',
|
||||
'security.featuresUnavailableMessage': 'Enable Cerberus in System Settings to use security features',
|
||||
'security.learnMore': 'Learn More',
|
||||
'security.adminWhitelist': 'Admin Whitelist',
|
||||
'security.adminWhitelistDescription': 'CIDRs that bypass security checks for admin access',
|
||||
'security.commaSeparatedCIDR': 'Comma-separated CIDRs (e.g., 192.168.1.0/24)',
|
||||
'security.generateToken': 'Generate Token',
|
||||
'security.generateTokenTooltip': 'Generate a one-time break-glass token for emergency access',
|
||||
'security.layer1': 'Layer 1',
|
||||
'security.layer2': 'Layer 2',
|
||||
'security.layer3': 'Layer 3',
|
||||
'security.layer4': 'Layer 4',
|
||||
'security.ids': 'IDS',
|
||||
'security.acl': 'ACL',
|
||||
'security.waf': 'WAF',
|
||||
'security.rate': 'Rate',
|
||||
'security.crowdsec': 'CrowdSec',
|
||||
'security.crowdsecDescription': 'IP Reputation',
|
||||
'security.crowdsecProtects': 'Blocks known attackers, botnets, and malicious IPs',
|
||||
'security.crowdsecDisabledDescription': 'Enable to block known malicious IPs',
|
||||
'security.accessControl': 'Access Control',
|
||||
'security.aclDescription': 'IP Allowlists/Blocklists',
|
||||
'security.aclProtects': 'Unauthorized IPs, geo-based attacks',
|
||||
'security.corazaWaf': 'Coraza WAF',
|
||||
'security.wafDescription': 'Request Inspection',
|
||||
'security.wafProtects': 'SQL injection, XSS, RCE',
|
||||
'security.wafDisabledDescription': 'Enable to inspect requests for threats',
|
||||
'security.rateLimiting': 'Rate Limiting',
|
||||
'security.rateLimitDescription': 'Volume Control',
|
||||
'security.rateLimitProtects': 'DDoS attacks, credential stuffing',
|
||||
'security.processStopped': 'Process stopped',
|
||||
'security.enableCerberusFirst': 'Enable Cerberus first',
|
||||
'security.toggleCrowdsec': 'Toggle CrowdSec',
|
||||
'security.toggleAcl': 'Toggle Access Control',
|
||||
'security.toggleWaf': 'Toggle WAF',
|
||||
'security.toggleRateLimit': 'Toggle Rate Limiting',
|
||||
'security.manageLists': 'Manage Lists',
|
||||
'security.auditLogs': 'Audit Logs',
|
||||
'security.notifications': 'Notifications',
|
||||
'security.threeHeadsTurn': 'Three heads turn',
|
||||
'security.cerberusConfigUpdating': 'Cerberus configuration updating',
|
||||
'security.summoningGuardian': 'Summoning the guardian',
|
||||
'security.crowdsecStarting': 'CrowdSec is starting',
|
||||
'security.guardianRests': 'Guardian rests',
|
||||
'security.crowdsecStopping': 'CrowdSec is stopping',
|
||||
'security.strengtheningGuard': 'Strengthening guard',
|
||||
'security.wardsActivating': 'Wards activating',
|
||||
'common.enabled': 'Enabled',
|
||||
'common.disabled': 'Disabled',
|
||||
'common.save': 'Save',
|
||||
'common.configure': 'Configure',
|
||||
'common.docs': 'Docs',
|
||||
'common.error': 'Error',
|
||||
'security.failedToLoadConfiguration': 'Failed to load security configuration',
|
||||
}
|
||||
// Handle interpolation for runningPid
|
||||
if (key === 'security.runningPid' && options?.pid !== undefined) {
|
||||
return `Running (pid ${options.pid})`
|
||||
}
|
||||
return translations[key] || key
|
||||
return securityTranslations[key] || key
|
||||
},
|
||||
}),
|
||||
}))
|
||||
@@ -117,17 +118,21 @@ vi.mock('../../components/LiveLogViewer', () => ({
|
||||
LiveLogViewer: () => <div data-testid="live-log-viewer">Mocked Live Log Viewer</div>,
|
||||
}))
|
||||
|
||||
vi.mock('../../components/SecurityNotificationSettingsModal', () => ({
|
||||
SecurityNotificationSettingsModal: () => null,
|
||||
}))
|
||||
|
||||
vi.mock('../../components/CrowdSecKeyWarning', () => ({
|
||||
CrowdSecKeyWarning: () => null,
|
||||
}))
|
||||
|
||||
// NOTE: CrowdSecBouncerKeyDisplay mock removed (moved to CrowdSecConfig page)
|
||||
|
||||
vi.mock('../../hooks/useSecurity', async (importOriginal) => {
|
||||
const actual = await importOriginal<typeof import('../../hooks/useSecurity')>()
|
||||
return {
|
||||
...actual,
|
||||
useSecurityConfig: vi.fn(() => ({ data: { config: { admin_whitelist: '10.0.0.0/8' } } })),
|
||||
useUpdateSecurityConfig: vi.fn(() => ({ mutate: vi.fn(), isPending: false })),
|
||||
useGenerateBreakGlassToken: vi.fn(() => ({ mutate: vi.fn(), isPending: false })),
|
||||
}
|
||||
})
|
||||
vi.mock('../../hooks/useSecurity', () => ({
|
||||
useSecurityConfig: vi.fn(() => ({ data: { config: { admin_whitelist: '10.0.0.0/8' } } })),
|
||||
useUpdateSecurityConfig: vi.fn(() => ({ mutate: vi.fn(), isPending: false })),
|
||||
useGenerateBreakGlassToken: vi.fn(() => ({ mutate: vi.fn(), isPending: false })),
|
||||
}))
|
||||
|
||||
const mockSecurityStatusAllEnabled = {
|
||||
cerberus: { enabled: true },
|
||||
@@ -166,7 +171,6 @@ describe('Security Page - Functional Tests', () => {
|
||||
vi.clearAllMocks()
|
||||
vi.mocked(crowdsecApi.statusCrowdsec).mockResolvedValue({ running: false, pid: 0, lapi_ready: false })
|
||||
vi.mocked(settingsApi.updateSetting).mockResolvedValue()
|
||||
vi.spyOn(window, 'open').mockImplementation(() => null)
|
||||
})
|
||||
|
||||
const wrapper = ({ children }: { children: React.ReactNode }) => (
|
||||
@@ -183,12 +187,25 @@ describe('Security Page - Functional Tests', () => {
|
||||
|
||||
describe('Page Loading States', () => {
|
||||
it('should show skeleton loading state initially', async () => {
|
||||
vi.mocked(securityApi.getSecurityStatus).mockReturnValue(new Promise(() => {}))
|
||||
const deferredStatus: { resolve: (value: typeof mockSecurityStatusAllEnabled) => void } = {
|
||||
resolve: () => {
|
||||
throw new Error('Test setup failed: pending status resolver was not initialized')
|
||||
},
|
||||
}
|
||||
const pendingStatus = new Promise<typeof mockSecurityStatusAllEnabled>((resolve) => {
|
||||
deferredStatus.resolve = resolve
|
||||
})
|
||||
vi.mocked(securityApi.getSecurityStatus).mockReturnValue(pendingStatus)
|
||||
|
||||
await renderSecurityPage()
|
||||
|
||||
const skeletons = document.querySelectorAll('.animate-pulse')
|
||||
expect(skeletons.length).toBeGreaterThan(0)
|
||||
|
||||
deferredStatus.resolve(mockSecurityStatusAllEnabled)
|
||||
await waitFor(() => {
|
||||
expect(screen.getByText(/Cerberus Dashboard/i)).toBeInTheDocument()
|
||||
})
|
||||
})
|
||||
|
||||
it('should display error message when security status fails to load', async () => {
|
||||
|
||||
@@ -128,6 +128,7 @@ console.error = (...args: unknown[]) => {
|
||||
if (typeof msg === 'string') {
|
||||
if (
|
||||
msg.includes("The current testing environment is not configured to support act(") ||
|
||||
msg.includes('not wrapped in act(') ||
|
||||
msg.includes('Test connection failed') ||
|
||||
msg.includes('Connection failed')
|
||||
) {
|
||||
|
||||
Reference in New Issue
Block a user