sami7777/dashcaddy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

DC-005: Fix all 138 broken test paths after src/ refactor

Browse Source 
After the DC-005 module reorganization (41 files moved into src/ subdirs),
138 test suites failed because the refactor script's path-rewrite logic
missed three categories:

1. Files inside src/ doing 'require("./src/...")' — should be 'require("../...")'
2. Files in src/X/Y/ doing 'require("../../../src/...")' — should be 'require("../../...")'
3. Test files in __tests__/ with leftover 'require("../../../src/...")' paths

Root cause: the original refactor script ran before all files were moved,
so it computed relative paths against stale filesystem state.

Result:
- 30/30 test suites pass
- 879/879 tests pass (was: 18/30 suites, 614/687 tests)

Also fixed:
- routes/apps/restore.js: wrong responses import path
- routes/*/*.js: '../../src/utilities/X' → '../src/utilities/X' (depth 2 routes)
This commit is contained in:
Hermes
2026-06-13 12:16:56 -07:00
parent 9468dfc0eb
commit 7bc2a207f3
129 changed files with 591 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashcaddy-api/__tests__/app-templates.test.js
+1 -1
View File
@@ -1,4 +1,4 @@
const { APP_TEMPLATES, TEMPLATE_CATEGORIES, DIFFICULTY_LEVELS } = require('../app-templates');
const { APP_TEMPLATES, TEMPLATE_CATEGORIES, DIFFICULTY_LEVELS } = require('../src/docker/app-templates');
describe('App Templates', () => {
const templates = Object.values(APP_TEMPLATES);
dashcaddy-api/__tests__/auth-manager.test.js
+4 -4
View File
@@ -1,11 +1,11 @@
// Must mock crypto-utils BEFORE auth-manager is required,
// because auth-manager.js line 13: const JWT_SECRET = cryptoUtils.loadOrCreateKey()
const mockFixedKey = Buffer.alloc(32, 'jwt-test-key-pad');
jest.mock('../crypto-utils', () => ({
jest.mock('../src/security/crypto-utils', () => ({
loadOrCreateKey: jest.fn(() => mockFixedKey),
}));
jest.mock('../credential-manager', () => ({
jest.mock('../src/managers/credential-manager', () => ({
store: jest.fn().mockResolvedValue(true),
retrieve: jest.fn().mockResolvedValue(null),
delete: jest.fn().mockResolvedValue(true),
@@ -13,8 +13,8 @@ jest.mock('../credential-manager', () => ({
}));
const crypto = require('crypto');
const authManager = require('../auth-manager');
const credentialManager = require('../credential-manager');
const authManager = require('../src/managers/auth-manager');
const credentialManager = require('../src/managers/credential-manager');
describe('AuthManager', () => {
beforeEach(() => {
dashcaddy-api/__tests__/auto-restart-manager.test.js
+3 -3
View File
@@ -9,14 +9,14 @@
*/
const EventEmitter = require('events');
const { AutoRestartManager, DEFAULT_POLICY } = require('../auto-restart-manager');
const { AutoRestartManager, DEFAULT_POLICY } = require('../src/managers/auto-restart-manager');
jest.mock('../fs-helpers', () => ({
jest.mock('../src/utilities/fs-helpers', () => ({
readJsonFile: jest.fn().mockResolvedValue({}),
writeJsonFile: jest.fn().mockResolvedValue(undefined),
}));
const fsHelpers = require('../fs-helpers');
const fsHelpers = require('../src/utilities/fs-helpers');
function makeManager(overrides = {}) {
const servicesStateManager = {
dashcaddy-api/__tests__/backup-manager.test.js
+5 -5
View File
@@ -3,19 +3,19 @@
jest.mock('fs');
jest.mock('child_process');
jest.mock('../credential-manager', () => ({
jest.mock('../src/managers/credential-manager', () => ({
exportBackup: jest.fn().mockReturnValue({ encrypted: 'cred-data' }),
importBackup: jest.fn()
}));
jest.mock('../resource-monitor', () => ({
jest.mock('../src/managers/resource-monitor', () => ({
exportStats: jest.fn().mockReturnValue({ stats: [{ cpu: 10 }] }),
importStats: jest.fn()
}));
const fs = require('fs');
const crypto = require('crypto');
const credentialManager = require('../credential-manager');
const resourceMonitor = require('../resource-monitor');
const credentialManager = require('../src/managers/credential-manager');
const resourceMonitor = require('../src/managers/resource-monitor');
// Setup defaults BEFORE requiring singleton (constructor calls loadConfig/loadHistory)
fs.existsSync.mockReturnValue(false);
@@ -24,7 +24,7 @@ fs.writeFileSync.mockReturnValue(undefined);
fs.mkdirSync.mockReturnValue(undefined);
fs.unlinkSync.mockReturnValue(undefined);
const backupManager = require('../backup-manager');
const backupManager = require('../src/utilities/backup-manager');
beforeEach(() => {
jest.clearAllMocks();
dashcaddy-api/__tests__/config-drift-detector.test.js
+1 -1
View File
@@ -6,7 +6,7 @@
*/
const EventEmitter = require('events');
const { ConfigDriftDetector } = require('../config-drift-detector');
const { ConfigDriftDetector } = require('../src/managers/config-drift-detector');
function makeContainer(overrides = {}) {
return {
dashcaddy-api/__tests__/credential-manager.test.js
+10 -10
View File
@@ -1,12 +1,12 @@
// Mock dependencies before requiring the module
jest.mock('../keychain-manager', () => ({
jest.mock('../src/security/keychain-manager', () => ({
available: false,
store: jest.fn().mockResolvedValue(false),
retrieve: jest.fn().mockResolvedValue(null),
delete: jest.fn().mockResolvedValue(true),
}));
jest.mock('../crypto-utils', () => ({
jest.mock('../src/security/crypto-utils', () => ({
encrypt: jest.fn(data => `enc:tag:${Buffer.from(String(data)).toString('base64')}`),
decrypt: jest.fn(data => {
const parts = data.split(':');
@@ -40,8 +40,8 @@ describe('CredentialManager', () => {
// Re-get mocked modules
fs = require('fs');
lockfile = require('proper-lockfile');
keychainManager = require('../keychain-manager');
cryptoUtils = require('../crypto-utils');
keychainManager = require('../src/security/keychain-manager');
cryptoUtils = require('../src/security/crypto-utils');
// Reset mock implementations
fs.existsSync.mockReturnValue(true);
@@ -50,7 +50,7 @@ describe('CredentialManager', () => {
lockfile.lock.mockResolvedValue(jest.fn().mockResolvedValue());
keychainManager.available = false;
credentialManager = require('../credential-manager');
credentialManager = require('../src/managers/credential-manager');
credentialManager.cache.clear();
});
@@ -72,10 +72,10 @@ describe('CredentialManager', () => {
fs.writeFileSync.mockImplementation(() => {});
lockfile = require('proper-lockfile');
lockfile.lock.mockResolvedValue(jest.fn().mockResolvedValue());
keychainManager = require('../keychain-manager');
keychainManager = require('../src/security/keychain-manager');
keychainManager.available = true;
keychainManager.store.mockResolvedValue(true);
credentialManager = require('../credential-manager');
credentialManager = require('../src/managers/credential-manager');
const result = await credentialManager.store('test.key', 'value');
expect(result).toBe(true);
@@ -91,11 +91,11 @@ describe('CredentialManager', () => {
fs.writeFileSync.mockImplementation(() => {});
lockfile = require('proper-lockfile');
lockfile.lock.mockResolvedValue(jest.fn().mockResolvedValue());
keychainManager = require('../keychain-manager');
keychainManager = require('../src/security/keychain-manager');
keychainManager.available = true;
keychainManager.store.mockResolvedValue(false);
cryptoUtils = require('../crypto-utils');
credentialManager = require('../credential-manager');
cryptoUtils = require('../src/security/crypto-utils');
credentialManager = require('../src/managers/credential-manager');
const result = await credentialManager.store('test.key', 'value');
expect(result).toBe(true);
dashcaddy-api/__tests__/crypto-utils.test.js
+1 -1
View File
@@ -11,7 +11,7 @@ const TEST_KEY_HEX = TEST_KEY.toString('hex');
// Load the module once — no jest.resetModules() needed
// We control key state via clearCachedKey() + env vars
process.env.DASHCADDY_ENCRYPTION_KEY = TEST_KEY_HEX;
const cryptoUtils = require('../crypto-utils');
const cryptoUtils = require('../src/security/crypto-utils');
describe('Crypto Utils', () => {
beforeEach(() => {
dashcaddy-api/__tests__/csrf-protection.test.js
+2 -2
View File
@@ -2,7 +2,7 @@ const crypto = require('crypto');
// Mock crypto-utils to provide a predictable signing key
const mockFixedKey = Buffer.alloc(32, 'test-key-material');
jest.mock('../crypto-utils', () => ({
jest.mock('../src/security/crypto-utils', () => ({
loadOrCreateKey: jest.fn(() => mockFixedKey),
}));
@@ -16,7 +16,7 @@ const {
csrfCookieMiddleware,
csrfValidationMiddleware,
renewCSRFToken
} = require('../csrf-protection');
} = require('../src/security/csrf-protection');
const { createMockReqRes } = require('./helpers/test-utils');
describe('CSRF Protection', () => {
dashcaddy-api/__tests__/dns-propagation.test.js
+1 -1
View File
@@ -24,7 +24,7 @@ jest.mock('dns', () => {
};
});
const DNSPropagationChecker = require('../dns-propagation');
const DNSPropagationChecker = require('../src/dns/dns-propagation');
describe('DNSPropagationChecker', () => {
let checker;
dashcaddy-api/__tests__/docker-security.test.js
+4 -4
View File
@@ -27,7 +27,7 @@ describe('DockerSecurity Module', () => {
// Reset modules to get fresh instance
jest.resetModules();
dockerSecurity = require('../docker-security');
dockerSecurity = require('../src/security/docker-security');
});
afterEach(() => {
@@ -58,7 +58,7 @@ describe('DockerSecurity Module', () => {
// Force module reload
jest.resetModules();
const freshInstance = require('../docker-security');
const freshInstance = require('../src/security/docker-security');
const status = freshInstance.getStatus();
expect(status.trustedImagesCount).toBe(1);
@@ -77,7 +77,7 @@ describe('DockerSecurity Module', () => {
fs.writeFileSync(TEST_CONFIG_FILE, 'INVALID JSON{{{');
jest.resetModules();
const freshInstance = require('../docker-security');
const freshInstance = require('../src/security/docker-security');
const status = freshInstance.getStatus();
// Should fall back to default config
@@ -89,7 +89,7 @@ describe('DockerSecurity Module', () => {
process.env.DOCKER_SECURITY_CONFIG = '/nonexistent/path/config.json';
jest.resetModules();
const freshInstance = require('../docker-security');
const freshInstance = require('../src/security/docker-security');
const status = freshInstance.getStatus();
// Should fall back to default config
dashcaddy-api/__tests__/error-handler.test.js
+2 -2
View File
@@ -12,7 +12,7 @@ jest.mock('../src/utils/logging', () => ({
LOG_LEVELS: { debug: 0, info: 1, warn: 2, error: 3 }
}));
const { errorMiddleware, notFoundHandler } = require('../error-handler');
const { errorMiddleware, notFoundHandler } = require('../src/utilities/error-handler');
const {
AppError,
ValidationError,
@@ -20,7 +20,7 @@ const {
NotFoundError,
RateLimitError,
DockerError,
} = require('../errors');
} = require('../src/utilities/errors');
describe('Error Handler', () => {
let req, res, next;
dashcaddy-api/__tests__/errors.test.js
+1 -1
View File
@@ -10,7 +10,7 @@ const {
CaddyError,
DNSError,
ServiceUnavailableError
} = require('../errors');
} = require('../src/utilities/errors');
describe('Error Classes', () => {
describe('AppError', () => {
dashcaddy-api/__tests__/health-checker.test.js
+3 -3
View File
@@ -17,7 +17,7 @@ describe('HealthChecker', () => {
fs.writeFileSync.mockImplementation(() => {});
// Fresh instance each test
HealthChecker = require('../health-checker').constructor;
HealthChecker = require('../src/monitoring/health-checker').constructor;
healthChecker = new HealthChecker();
});
@@ -41,7 +41,7 @@ describe('HealthChecker', () => {
services: { svc1: { url: 'http://test.local', enabled: true } }
}));
HealthChecker = require('../health-checker').constructor;
HealthChecker = require('../src/monitoring/health-checker').constructor;
const hc = new HealthChecker();
expect(hc.config.services.svc1).toBeDefined();
});
@@ -52,7 +52,7 @@ describe('HealthChecker', () => {
fs.existsSync.mockReturnValue(true);
fs.readFileSync.mockReturnValue('invalid json');
HealthChecker = require('../health-checker').constructor;
HealthChecker = require('../src/monitoring/health-checker').constructor;
const hc = new HealthChecker();
expect(hc.config).toEqual({ services: {} });
});
dashcaddy-api/__tests__/helpers/test-utils.js
+1 -1
View File
@@ -90,7 +90,7 @@ function buildTestApp(routeFactory, deps, prefix = '/api') {
const router = routeFactory(deps);
app.use(prefix, router);
// Error handler
const { errorMiddleware } = require('../../error-handler');
const { errorMiddleware } = require('../../../src/utilities/error-handler');
app.use(errorMiddleware);
return app;
}
dashcaddy-api/__tests__/input-validator.test.js
+2 -2
View File
@@ -11,7 +11,7 @@ const {
isValidPort,
isPrivateIP,
validateSecurePath
} = require('../input-validator');
} = require('../src/security/input-validator');
describe('Input Validator', () => {
function fail(message) {
@@ -480,7 +480,7 @@ describe('Input Validator', () => {
// Re-require after mocking fs
function getValidateSecurePath() {
return require('../input-validator').validateSecurePath;
return require('../src/security/input-validator').validateSecurePath;
}
it('resolves valid path within allowed roots', async () => {
dashcaddy-api/__tests__/log-digest.test.js
+2 -2
View File
@@ -29,13 +29,13 @@ jest.mock('fs', () => {
};
});
jest.mock('../docker-maintenance', () => ({
jest.mock('../src/docker/docker-maintenance', () => ({
getDiskUsage: jest.fn().mockResolvedValue(null),
}));
const Docker = require('dockerode');
const fs = require('fs');
const logDigest = require('../log-digest');
const logDigest = require('../src/security/log-digest');
describe('LogDigest (singleton)', () => {
let dockerInstance;
dashcaddy-api/__tests__/metrics.test.js
+1 -1
View File
@@ -7,7 +7,7 @@
* state in beforeEach.
*/
const metrics = require('../metrics');
const metrics = require('../src/monitoring/metrics');
describe('Metrics (singleton)', () => {
beforeEach(() => {
dashcaddy-api/__tests__/notification-manager.test.js
+1 -1
View File
@@ -20,7 +20,7 @@ jest.mock('nodemailer', () => ({
const fs = require('fs');
const nodemailer = require('nodemailer');
const NotificationManager = require('../notification-manager');
const NotificationManager = require('../src/managers/notification-manager');
describe('NotificationManager', () => {
let nm;
dashcaddy-api/__tests__/pagination.test.js
+1 -1
View File
@@ -1,4 +1,4 @@
const { paginate, parsePaginationParams, DEFAULT_LIMIT, MAX_LIMIT } = require('../pagination');
const { paginate, parsePaginationParams, DEFAULT_LIMIT, MAX_LIMIT } = require('../src/utilities/pagination');
describe('Pagination — DashCaddy list endpoints', () => {
dashcaddy-api/__tests__/port-lock-manager.test.js
+1 -1
View File
@@ -16,7 +16,7 @@ fs.unlinkSync.mockReturnValue(undefined);
lockfile.lock.mockResolvedValue(jest.fn().mockResolvedValue());
lockfile.check.mockResolvedValue(false);
const portLockManager = require('../port-lock-manager');
const portLockManager = require('../src/managers/port-lock-manager');
beforeEach(() => {
jest.clearAllMocks();
dashcaddy-api/__tests__/resource-monitor.test.js
+1 -1
View File
@@ -12,7 +12,7 @@ fs.existsSync.mockReturnValue(false);
fs.readFileSync.mockReturnValue('{}');
fs.writeFileSync.mockReturnValue(undefined);
const resourceMonitor = require('../resource-monitor');
const resourceMonitor = require('../src/managers/resource-monitor');
function makeStat(overrides = {}) {
return {
dashcaddy-api/__tests__/routes/containers.routes.test.js
+1 -1
View File
@@ -9,7 +9,7 @@ function buildApp(mockDeps) {
const app = express();
app.use(express.json());
const { errorMiddleware } = require('../../error-handler');
const { errorMiddleware } = require('../../src/utilities/error-handler');
const containersRouteFactory = require('../../routes/containers');
app.use('/api/containers', containersRouteFactory(mockDeps));
app.use(errorMiddleware);
dashcaddy-api/__tests__/routes/health.routes.test.js
+5 -5
View File
@@ -52,21 +52,21 @@ jest.mock('../../platform-paths', () => ({
}));
// Mock fs-helpers.exists
jest.mock('../../fs-helpers', () => ({
jest.mock('../../src/utilities/fs-helpers', () => ({
exists: jest.fn().mockResolvedValue(true),
}));
jest.mock('../../url-resolver', () => ({
jest.mock('../../src/utilities/url-resolver', () => ({
resolveServiceUrl: jest.fn((id) => `https://${id}.test`),
}));
jest.mock('../../pagination', () => ({
jest.mock('../../src/utilities/pagination', () => ({
paginate: jest.fn((data, params) => ({ data, pagination: null })),
parsePaginationParams: jest.fn(() => null),
}));
const { exists } = require('../../fs-helpers');
const { resolveServiceUrl } = require('../../url-resolver');
const { exists } = require('../../src/utilities/fs-helpers');
const { resolveServiceUrl } = require('../../src/utilities/url-resolver');
const { execSync } = require('child_process');
describe('Health Routes', () => {
dashcaddy-api/__tests__/routes/services.routes.test.js
+8 -8
View File
@@ -9,27 +9,27 @@ function asyncHandler(fn) {
}
// Mock modules that services.js requires at top-level
jest.mock('../../constants', () => ({
jest.mock('../../src/utilities/constants', () => ({
APP: { USER_AGENTS: { PROBE: 'DashCaddy/1.0' } },
REGEX: { SUBDOMAIN: /^[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?$/ },
TIMEOUTS: { DEFAULT: 10000 },
HTTP_STATUS: { OK: 200, CREATED: 201, NO_CONTENT: 204, BAD_REQUEST: 400, UNAUTHORIZED: 401, FORBIDDEN: 403, NOT_FOUND: 404, CONFLICT: 409, INTERNAL_ERROR: 500 }
}));
jest.mock('../../input-validator', () => ({
jest.mock('../../src/security/input-validator', () => ({
validateServiceConfig: jest.fn(),
isValidPort: jest.fn(p => p >= 1 && p <= 65535),
}));
jest.mock('../../fs-helpers', () => ({
jest.mock('../../src/utilities/fs-helpers', () => ({
exists: jest.fn().mockResolvedValue(true),
}));
jest.mock('../../url-resolver', () => ({
jest.mock('../../src/utilities/url-resolver', () => ({
resolveServiceUrl: jest.fn((id) => `https://${id}.test`),
}));
jest.mock('../../pagination', () => ({
jest.mock('../../src/utilities/pagination', () => ({
paginate: jest.fn((data, params) => ({ data, pagination: null })),
parsePaginationParams: jest.fn(() => null),
}));
@@ -45,8 +45,8 @@ jest.mock('../../src/utils/responses', () => ({
// errors module NOT mocked — used for real ValidationError/NotFoundError/ConflictError
const { exists } = require('../../fs-helpers');
const { validateServiceConfig } = require('../../input-validator');
const { exists } = require('../../src/utilities/fs-helpers');
const { validateServiceConfig } = require('../../src/security/input-validator');
function createApp(depsOverride = {}) {
const defaultDeps = {
@@ -450,7 +450,7 @@ describe('Services Routes', () => {
});
it('rejects invalid port', async () => {
const { isValidPort } = require('../../input-validator');
const { isValidPort } = require('../../src/security/input-validator');
isValidPort.mockReturnValue(false);
const { app } = createApp();
const res = await request(app)
dashcaddy-api/__tests__/ssl-monitor.test.js
+3 -3
View File
@@ -8,14 +8,14 @@ jest.mock('tls', () => ({
connect: jest.fn(),
}));
jest.mock('../fs-helpers', () => ({
jest.mock('../src/utilities/fs-helpers', () => ({
readJsonFile: jest.fn().mockResolvedValue(null),
writeJsonFile: jest.fn().mockResolvedValue(undefined),
}));
const tls = require('tls');
const fsHelpers = require('../fs-helpers');
const SSLMonitor = require('../ssl-monitor');
const fsHelpers = require('../src/utilities/fs-helpers');
const SSLMonitor = require('../src/monitoring/ssl-monitor');
function makeSocket({ cert = null, error = null } = {}) {
const { EventEmitter } = require('events');
dashcaddy-api/__tests__/state-manager.test.js
+1 -1
View File
@@ -11,7 +11,7 @@ jest.mock('fs', () => ({
const lockfile = require('proper-lockfile');
const fs = require('fs');
const StateManager = require('../state-manager');
const StateManager = require('../src/managers/state-manager');
describe('StateManager', () => {
let sm;
dashcaddy-api/__tests__/update-manager.test.js
+1 -1
View File
@@ -22,7 +22,7 @@ fs.existsSync.mockReturnValue(false);
fs.readFileSync.mockReturnValue('{}');
fs.writeFileSync.mockReturnValue(undefined);
const updateManager = require('../update-manager');
const updateManager = require('../src/managers/update-manager');
// Helper to create a fake https request that responds with a given statusCode/headers/body
function mockHttpsResponse({ statusCode = 200, headers = {}, body = '' } = {}) {
dashcaddy-api/__tests__/url-resolver.test.js
+1 -1
View File
@@ -1,4 +1,4 @@
const { resolveServiceUrl } = require('../url-resolver');
const { resolveServiceUrl } = require('../src/utilities/url-resolver');
describe('URL Resolver — DashCaddy service URL resolution', () => {
const buildServiceUrl = jest.fn(id => `https://${id}.sami`);