* add test suite, mostly covers integration testing, tests are only backend side * workflow runs the correct script * workflow runs the correct script * workflow runs the correct script * unit tests incoming * Fix multer silent rejections and error handler info leak - Revert cb(null, false) to cb(new Error(...)) in auth.ts, collab.ts, and files.ts so invalid uploads return an error instead of silently dropping the file - Error handler in app.ts now always returns 500 / "Internal server error" instead of forwarding err.message to the client * Use statusCode consistently for multer errors and error handler - Error handler in app.ts reads err.statusCode to forward the correct HTTP status while keeping the response body generic
244 lines
11 KiB
TypeScript
244 lines
11 KiB
TypeScript
/**
|
|
* Reservations integration tests.
|
|
* Covers RESV-001 to RESV-007.
|
|
*/
|
|
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
|
import request from 'supertest';
|
|
import type { Application } from 'express';
|
|
|
|
const { testDb, dbMock } = vi.hoisted(() => {
|
|
const Database = require('better-sqlite3');
|
|
const db = new Database(':memory:');
|
|
db.exec('PRAGMA journal_mode = WAL');
|
|
db.exec('PRAGMA foreign_keys = ON');
|
|
db.exec('PRAGMA busy_timeout = 5000');
|
|
const mock = {
|
|
db,
|
|
closeDb: () => {},
|
|
reinitialize: () => {},
|
|
getPlaceWithTags: (placeId: number) => {
|
|
const place: any = db.prepare(`SELECT p.*, c.name as category_name, c.color as category_color, c.icon as category_icon FROM places p LEFT JOIN categories c ON p.category_id = c.id WHERE p.id = ?`).get(placeId);
|
|
if (!place) return null;
|
|
const tags = db.prepare(`SELECT t.* FROM tags t JOIN place_tags pt ON t.id = pt.tag_id WHERE pt.place_id = ?`).all(placeId);
|
|
return { ...place, category: place.category_id ? { id: place.category_id, name: place.category_name, color: place.category_color, icon: place.category_icon } : null, tags };
|
|
},
|
|
canAccessTrip: (tripId: any, userId: number) =>
|
|
db.prepare(`SELECT t.id, t.user_id FROM trips t LEFT JOIN trip_members m ON m.trip_id = t.id AND m.user_id = ? WHERE t.id = ? AND (t.user_id = ? OR m.user_id IS NOT NULL)`).get(userId, tripId, userId),
|
|
isOwner: (tripId: any, userId: number) =>
|
|
!!db.prepare('SELECT id FROM trips WHERE id = ? AND user_id = ?').get(tripId, userId),
|
|
};
|
|
return { testDb: db, dbMock: mock };
|
|
});
|
|
|
|
vi.mock('../../src/db/database', () => dbMock);
|
|
vi.mock('../../src/config', () => ({
|
|
JWT_SECRET: 'test-jwt-secret-for-trek-testing-only',
|
|
ENCRYPTION_KEY: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2',
|
|
updateJwtSecret: () => {},
|
|
}));
|
|
|
|
import { createApp } from '../../src/app';
|
|
import { createTables } from '../../src/db/schema';
|
|
import { runMigrations } from '../../src/db/migrations';
|
|
import { resetTestDb } from '../helpers/test-db';
|
|
import { createUser, createTrip, createDay, createReservation, addTripMember } from '../helpers/factories';
|
|
import { authCookie } from '../helpers/auth';
|
|
import { loginAttempts, mfaAttempts } from '../../src/routes/auth';
|
|
|
|
const app: Application = createApp();
|
|
|
|
beforeAll(() => {
|
|
createTables(testDb);
|
|
runMigrations(testDb);
|
|
});
|
|
|
|
beforeEach(() => {
|
|
resetTestDb(testDb);
|
|
loginAttempts.clear();
|
|
mfaAttempts.clear();
|
|
});
|
|
|
|
afterAll(() => {
|
|
testDb.close();
|
|
});
|
|
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
// Create reservation
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
describe('Create reservation', () => {
|
|
it('RESV-001 — POST /api/trips/:tripId/reservations creates a reservation', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
|
|
const res = await request(app)
|
|
.post(`/api/trips/${trip.id}/reservations`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ title: 'Hotel Check-in', type: 'hotel' });
|
|
expect(res.status).toBe(201);
|
|
expect(res.body.reservation.title).toBe('Hotel Check-in');
|
|
expect(res.body.reservation.type).toBe('hotel');
|
|
});
|
|
|
|
it('RESV-001 — POST without title returns 400', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
|
|
const res = await request(app)
|
|
.post(`/api/trips/${trip.id}/reservations`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ type: 'hotel' });
|
|
expect(res.status).toBe(400);
|
|
});
|
|
|
|
it('RESV-001 — non-member cannot create reservation', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: other } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
|
|
const res = await request(app)
|
|
.post(`/api/trips/${trip.id}/reservations`)
|
|
.set('Cookie', authCookie(other.id))
|
|
.send({ title: 'Hotel', type: 'hotel' });
|
|
expect(res.status).toBe(404);
|
|
});
|
|
|
|
it('RESV-002 — POST with create_accommodation creates an accommodation record', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const day = createDay(testDb, trip.id, { date: '2025-06-01' });
|
|
|
|
const res = await request(app)
|
|
.post(`/api/trips/${trip.id}/reservations`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ title: 'Grand Hotel', type: 'hotel', day_id: day.id, create_accommodation: true });
|
|
expect(res.status).toBe(201);
|
|
expect(res.body.reservation).toBeDefined();
|
|
});
|
|
});
|
|
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
// List reservations
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
describe('List reservations', () => {
|
|
it('RESV-003 — GET /api/trips/:tripId/reservations returns all reservations', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
createReservation(testDb, trip.id, { title: 'Flight Out', type: 'flight' });
|
|
createReservation(testDb, trip.id, { title: 'Hotel Stay', type: 'hotel' });
|
|
|
|
const res = await request(app)
|
|
.get(`/api/trips/${trip.id}/reservations`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.reservations).toHaveLength(2);
|
|
});
|
|
|
|
it('RESV-003 — returns empty array when no reservations exist', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
|
|
const res = await request(app)
|
|
.get(`/api/trips/${trip.id}/reservations`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.reservations).toHaveLength(0);
|
|
});
|
|
|
|
it('RESV-007 — non-member cannot list reservations', async () => {
|
|
const { user: owner } = createUser(testDb);
|
|
const { user: other } = createUser(testDb);
|
|
const trip = createTrip(testDb, owner.id);
|
|
|
|
const res = await request(app)
|
|
.get(`/api/trips/${trip.id}/reservations`)
|
|
.set('Cookie', authCookie(other.id));
|
|
expect(res.status).toBe(404);
|
|
});
|
|
});
|
|
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
// Update reservation
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
describe('Update reservation', () => {
|
|
it('RESV-004 — PUT updates reservation fields', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const resv = createReservation(testDb, trip.id, { title: 'Old Flight', type: 'flight' });
|
|
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/reservations/${resv.id}`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ title: 'New Flight', confirmation_number: 'ABC123' });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.reservation.title).toBe('New Flight');
|
|
expect(res.body.reservation.confirmation_number).toBe('ABC123');
|
|
});
|
|
|
|
it('RESV-004 — PUT on non-existent reservation returns 404', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/reservations/99999`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ title: 'Updated' });
|
|
expect(res.status).toBe(404);
|
|
});
|
|
});
|
|
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
// Delete reservation
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
describe('Delete reservation', () => {
|
|
it('RESV-005 — DELETE removes reservation', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const resv = createReservation(testDb, trip.id, { title: 'Flight', type: 'flight' });
|
|
|
|
const del = await request(app)
|
|
.delete(`/api/trips/${trip.id}/reservations/${resv.id}`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(del.status).toBe(200);
|
|
expect(del.body.success).toBe(true);
|
|
|
|
const list = await request(app)
|
|
.get(`/api/trips/${trip.id}/reservations`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(list.body.reservations).toHaveLength(0);
|
|
});
|
|
|
|
it('RESV-005 — DELETE non-existent reservation returns 404', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
|
|
const res = await request(app)
|
|
.delete(`/api/trips/${trip.id}/reservations/99999`)
|
|
.set('Cookie', authCookie(user.id));
|
|
expect(res.status).toBe(404);
|
|
});
|
|
});
|
|
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
// Batch update positions
|
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
|
|
describe('Batch update positions', () => {
|
|
it('RESV-006 — PUT /positions updates reservation sort order', async () => {
|
|
const { user } = createUser(testDb);
|
|
const trip = createTrip(testDb, user.id);
|
|
const r1 = createReservation(testDb, trip.id, { title: 'First', type: 'flight' });
|
|
const r2 = createReservation(testDb, trip.id, { title: 'Second', type: 'hotel' });
|
|
|
|
const res = await request(app)
|
|
.put(`/api/trips/${trip.id}/reservations/positions`)
|
|
.set('Cookie', authCookie(user.id))
|
|
.send({ positions: [{ id: r2.id, position: 0 }, { id: r1.id, position: 1 }] });
|
|
expect(res.status).toBe(200);
|
|
expect(res.body.success).toBe(true);
|
|
});
|
|
});
|