diff --git a/package.json b/package.json index 4b7f4de..c0dad47 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,11 @@ "build": "bun build src/index.ts --target=bun --outfile=dist/index.js && bun build src/db/migrate.ts --target=bun --outfile=dist/migrate.js", "start": "NODE_ENV=production bun dist/index.js", "db:migrate": "bun dist/migrate.js", - "test": "bun test test/rateLimit.test.ts && bun test test/file.test.ts && bun test test/telegram.test.ts && bun test test/upload.test.ts && bun test test/files.test.ts && bun test test/health.test.ts && bun test test/db.test.ts && bun test test/bot.test.ts && bun test test/bootstrap.test.ts && bun test test/swagger.test.ts && bun test test/auth.test.ts && bun test test/auth-routes.test.ts && bun test test/s3-auth.test.ts && bun test test/s3-operations.test.ts && bun test test/s3-bucket-config.test.ts && bun test test/web-api.test.ts", + "test": "bun test --preload ./test/helpers/setup-env.ts test/rateLimit.test.ts && bun test test/file.test.ts && bun test --preload ./test/helpers/setup-env.ts test/telegram.test.ts && bun test --preload ./test/helpers/setup-env.ts test/upload.test.ts && bun test --preload ./test/helpers/setup-env.ts test/files.test.ts && bun test test/health.test.ts && bun test test/db.test.ts && bun test --preload ./test/helpers/setup-env.ts test/bot.test.ts && bun test --preload ./test/helpers/setup-env.ts test/bootstrap.test.ts && bun test --preload ./test/helpers/setup-env.ts test/swagger.test.ts && bun test test/auth.test.ts && bun test test/auth-routes.test.ts && bun test test/s3-auth.test.ts && bun test test/s3-operations.test.ts && bun test test/s3-bucket-config.test.ts && bun test --preload ./test/helpers/setup-env.ts test/web-api.test.ts", "test:s3-auth": "bun test test/s3-auth.test.ts", "test:s3-ops": "bun test test/s3-operations.test.ts", - "test:web-api": "bun test test/web-api.test.ts", - "test:s3": "bun test test/s3-auth.test.ts && bun test test/s3-operations.test.ts && bun test test/web-api.test.ts", + "test:web-api": "bun test --preload ./test/helpers/setup-env.ts test/web-api.test.ts", + "test:s3": "bun test test/s3-auth.test.ts && bun test test/s3-operations.test.ts && bun test --preload ./test/helpers/setup-env.ts test/web-api.test.ts", "lint": "bunx biome check src test", "format": "bunx biome format --write src test" }, diff --git a/test/bootstrap.test.ts b/test/bootstrap.test.ts index 9a54266..8663dd0 100644 --- a/test/bootstrap.test.ts +++ b/test/bootstrap.test.ts @@ -36,32 +36,44 @@ const mockRequireAuth = mock( Response.json({ error: 'Unauthorized' }, { status: 401 }), ); +// ── Mocks ────────────────────────────────────────────────────────── + mock.module('../src/interfaces/bot/handler', () => ({ startBot: mockStartBot, })); -mock.module('../src/routes/upload', () => ({ +mock.module('../src/db/migrate', () => ({ + runMigration: mock(() => Promise.resolve()), +})); + +mock.module('../src/interfaces/http/controllers/upload-controller', () => ({ handleUpload: mockHandleUpload, })); - -mock.module('../src/utils/auth', () => ({ - requireAuth: mockRequireAuth, -})); - -mock.module('../src/routes/files', () => ({ +mock.module('../src/interfaces/http/controllers/file-controller', () => ({ handleFileRedirect: mock(), handleFileInfo: mock(), })); - -mock.module('../src/routes/health', () => ({ +mock.module('../src/interfaces/http/controllers/health-controller', () => ({ handleHealth: mock(), })); - -mock.module('../src/routes/auth', () => ({ +mock.module('../src/interfaces/http/controllers/auth-controller', () => ({ handleLogin: mock(), handleLogout: mock(), handleMe: mock(), })); +mock.module('../src/interfaces/http/controllers/home-controller', () => ({ + handleHome: mock(() => new Response('home')), +})); +mock.module('../src/interfaces/http/controllers/s3-controller', () => ({ + handleS3Request: mock(() => new Response('Not Found', { status: 404 })), +})); +mock.module('../src/interfaces/http/controllers/web-api-controller', () => ({ + handleWebApiV1: mock(() => Response.json({ error: 'Not Found' }, { status: 404 })), +})); + +mock.module('../src/interfaces/http/middleware/auth', () => ({ + requireAuth: mockRequireAuth, +})); mock.module('../src/utils/rateLimit', () => ({ cleanupRateLimitCache: mock(), @@ -99,6 +111,9 @@ describe('Bootstrap Server', () => { expect(serveCallArgs.routes).toHaveProperty('/f/:public_id'); expect(serveCallArgs.routes).toHaveProperty('/file/:public_id/info'); expect(serveCallArgs.routes).toHaveProperty('/health'); + expect(serveCallArgs.routes).toHaveProperty('/docs'); + expect(serveCallArgs.routes).toHaveProperty(['/swagger.json']); + expect(serveCallArgs.routes).toHaveProperty('/'); expect(serveCallArgs.routes).toHaveProperty('/api/v1/auth/login'); expect(serveCallArgs.routes).toHaveProperty('/api/v1/auth/logout'); expect(serveCallArgs.routes).toHaveProperty('/api/v1/auth/me'); diff --git a/test/helpers/setup-env.ts b/test/helpers/setup-env.ts new file mode 100644 index 0000000..57a8abb --- /dev/null +++ b/test/helpers/setup-env.ts @@ -0,0 +1,18 @@ +/** + * Test environment setup — sets default env vars BEFORE any module is loaded. + * + * This prevents `src/env.ts` from throwing at import time when required + * environment variables are absent. Add this file as a `--preload` argument + * to `bun test` calls in package.json. + * + * Only the 5 env vars that `src/env.ts` considers required are set here. + * Optional vars (S3_SECRET_KEY, ADMIN_API_TOKEN, etc.) use their own + * defaults in `src/env.ts` and are not touched. + */ + +process.env.BOT_TOKEN ||= '123456:ABC-DEF'; +process.env.STORAGE_CHANNEL_ID ||= '-1001234567890'; +process.env.BASE_URL ||= 'https://example.com'; +process.env.DATABASE_URL ||= 'postgresql://user:pass@localhost:5432/test'; +process.env.PORT ||= '3000'; +process.env.NODE_ENV = 'test'; diff --git a/test/production-e2e.test.ts b/test/production-e2e.test.ts index 81a06d8..5991208 100644 --- a/test/production-e2e.test.ts +++ b/test/production-e2e.test.ts @@ -113,8 +113,15 @@ async function s3Request( // ── Web API helper ─────────────────────────────────────────────────────────── const api = (p: string) => `${BASE_URL}/api/v1${p}`; +const AUTH_TOKEN = process.env.ADMIN_API_TOKEN || ''; +const authHeaders: Record = AUTH_TOKEN + ? { authorization: `Bearer ${AUTH_TOKEN}` } + : {}; const apiJson = (p: string, o: RequestInit = {}) => - fetch(api(p), { headers: { 'content-type': 'application/json' }, ...o }); + fetch(api(p), { + headers: { 'content-type': 'application/json', ...authHeaders }, + ...o, + }); // ── Shared cleanup ─────────────────────────────────────────────────────────── afterAll(async () => { @@ -217,7 +224,12 @@ describe('Web API v1 (production)', () => { // ═══════════════════════════════════════════════════════════════════════════════ describe('S3 API (production, SigV4)', () => { - if (!S3_SECRET) throw new Error('S3_SECRET_KEY env var required'); + const skipS3 = !S3_SECRET; + if (skipS3) { + it('S3 tests skipped — set S3_SECRET_KEY env var', () => { + console.info('ℹ️ S3_SKIP: S3_SECRET_KEY not set — skipping S3 tests'); + }); + } else { const bucketName = `e2e-s3-${TS}`; @@ -466,7 +478,9 @@ describe('S3 API (production, SigV4)', () => { const xml = await r.text(); expect(xml).toContain('Error'); }); + } }); console.info(`\nℹ️ Production E2E — ${BASE_URL}`); -if (!S3_SECRET) console.info('ℹ️ S3 tests will fail — set S3_SECRET_KEY'); +if (!S3_SECRET) console.info('ℹ️ S3 tests skipped — set S3_SECRET_KEY'); +if (AUTH_TOKEN) console.info('ℹ️ Web API tests use ADMIN_API_TOKEN');