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/src/app.js
+40 -40
View File
@@ -15,41 +15,41 @@ const { errorResponse, ok } = require('./utils/responses');
const { asyncHandler } = require('./utils/async-handler');
// Managers and utilities
const StateManager = require('../state-manager');
const StateManager = require('managers/state-manager');
const platformPaths = require('../platform-paths');
const { LicenseManager } = require('../license-manager');
const credentialManager = require('../credential-manager');
const authManager = require('../auth-manager');
const dockerSecurity = require('../docker-security');
const auditLogger = require('../audit-logger');
const portLockManager = require('../port-lock-manager');
const resourceMonitor = require('../resource-monitor');
const backupManager = require('../backup-manager');
const healthChecker = require('../health-checker');
const updateManager = require('../update-manager');
const selfUpdater = require('../self-updater');
const configureMiddleware = require('../middleware');
const { validateStartupConfig: _validateStartupConfig, syncHealthCheckerServices } = require('../startup-validator');
const { CSRF_HEADER_NAME } = require('../csrf-protection');
const { resolveServiceUrl } = require('../url-resolver');
const metrics = require('../metrics');
const { validateURL } = require('../input-validator');
const { LicenseManager } = require('managers/license-manager');
const credentialManager = require('managers/credential-manager');
const authManager = require('managers/auth-manager');
const dockerSecurity = require('security/docker-security');
const auditLogger = require('security/audit-logger');
const portLockManager = require('managers/port-lock-manager');
const resourceMonitor = require('managers/resource-monitor');
const backupManager = require('utilities/backup-manager');
const healthChecker = require('monitoring/health-checker');
const updateManager = require('managers/update-manager');
const selfUpdater = require('docker/self-updater');
const configureMiddleware = require('utilities/middleware');
const { validateStartupConfig: _validateStartupConfig, syncHealthCheckerServices } = require('utilities/startup-validator');
const { CSRF_HEADER_NAME } = require('security/csrf-protection');
const { resolveServiceUrl } = require('utilities/url-resolver');
const metrics = require('monitoring/metrics');
const { validateURL } = require('security/input-validator');
// Optional modules
let dockerMaintenance, logDigest;
try { dockerMaintenance = require('../docker-maintenance'); } catch (_) { /* optional module */ }
try { logDigest = require('../log-digest'); } catch (_) { /* optional module */ }
try { dockerMaintenance = require('docker/docker-maintenance'); } catch (_) { /* optional module */ }
try { logDigest = require('security/log-digest'); } catch (_) { /* optional module */ }
// Workflow engine (bundled workflows)
let bundledWorkflowsModule;
let workflowEngine = null;
try {
bundledWorkflowsModule = require('../bundled-workflows');
bundledWorkflowsModule = require('recipes/bundled-workflows');
} catch (_) { /* optional module */ }
// Templates
const { APP_TEMPLATES, TEMPLATE_CATEGORIES, DIFFICULTY_LEVELS } = require('../app-templates');
const { RECIPE_TEMPLATES, RECIPE_CATEGORIES } = require('../recipe-templates');
const { APP_TEMPLATES, TEMPLATE_CATEGORIES, DIFFICULTY_LEVELS } = require('docker/app-templates');
const { RECIPE_TEMPLATES, RECIPE_CATEGORIES } = require('recipes/recipe-templates');
// Route modules
const healthRoutes = require('../routes/health');
@@ -79,17 +79,17 @@ const dockerResourcesRoutes = require('../routes/docker-resources');
const eventsRoutes = require('../routes/events');
const workflowsRoutes = require('../routes/workflows');
const dependenciesRoutes = require('../routes/dependencies');
const DependencyManager = require('../dependency-manager');
const DependencyManager = require('managers/dependency-manager');
const autoRestartRoutes = require('../routes/auto-restart');
const configDriftRoutes = require('../routes/config-drift');
const sslMonitorRoutes = require('../routes/ssl-monitor');
const { AutoRestartManager } = require('../auto-restart-manager');
const { ConfigDriftDetector } = require('../config-drift-detector');
const SSLMonitor = require('../ssl-monitor');
const DNSPropagationChecker = require('../dns-propagation');
const { AutoRestartManager } = require('managers/auto-restart-manager');
const { ConfigDriftDetector } = require('managers/config-drift-detector');
const SSLMonitor = require('monitoring/ssl-monitor');
const DNSPropagationChecker = require('dns/dns-propagation');
// Constants
const { APP } = require('../constants');
const { APP } = require('utilities/constants');
/**
* Create and configure the Express application
@@ -216,15 +216,15 @@ async function createApp() {
auditLogger,
authManager,
log,
cryptoUtils: require('../crypto-utils'),
cryptoUtils: require('security/crypto-utils'),
isValidContainerId,
isTailscaleIP,
getTailscaleStatus,
RATE_LIMITS: require('../constants').RATE_LIMITS,
LIMITS: require('../constants').LIMITS,
APP: require('../constants').APP,
CACHE_CONFIGS: require('../cache-config').CACHE_CONFIGS,
createCache: require('../cache-config').createCache,
RATE_LIMITS: require('utilities/constants').RATE_LIMITS,
LIMITS: require('utilities/constants').LIMITS,
APP: require('utilities/constants').APP,
CACHE_CONFIGS: require('utilities/cache-config').CACHE_CONFIGS,
createCache: require('utilities/cache-config').createCache,
});
const { strictLimiter } = middlewareResult;
@@ -237,7 +237,7 @@ async function createApp() {
// eslint-disable-next-line require-await -- may grow awaits as config loading evolves
async function readConfig() {
const { readJsonFile } = require('../fs-helpers');
const { readJsonFile } = require('utilities/fs-helpers');
return readJsonFile(config.CONFIG_FILE, {});
}
@@ -260,7 +260,7 @@ async function createApp() {
async function saveTotpConfig() {
try {
const { writeJsonFile } = require('../fs-helpers');
const { writeJsonFile } = require('utilities/fs-helpers');
await writeJsonFile(config.TOTP_CONFIG_FILE, totpConfig);
} catch (e) {
log.error('config', 'Could not save TOTP config', { error: e.message });
@@ -731,7 +731,7 @@ async function createApp() {
// Lightweight probe endpoint
app.get('/probe/:id', boundAsyncHandler(async (req, res) => {
const id = req.params.id;
const { exists } = require('../fs-helpers');
const { exists } = require('utilities/fs-helpers');
let service = null;
if (id !== 'internet' && await exists(config.SERVICES_FILE)) {
@@ -871,7 +871,7 @@ async function createApp() {
app.get('/api/v1/docs/spec', boundAsyncHandler(async (req, res) => {
const path = require('path');
const { exists } = require('../fs-helpers');
const { exists } = require('utilities/fs-helpers');
const fsp = require('fs').promises;
const specPath = path.join(__dirname, '../openapi.yaml');
@@ -884,7 +884,7 @@ async function createApp() {
}, 'api-docs-spec'));
// Error handlers (MUST be last)
const { notFoundHandler, errorMiddleware } = require('../error-handler');
const { notFoundHandler, errorMiddleware } = require('utilities/error-handler');
app.use('/api', notFoundHandler);
app.use(errorMiddleware);