Compare commits

...

2 commits

Author SHA1 Message Date
xeruf
199a74a5d4 test(calendar): remove line ending normalization 2024-11-25 13:01:23 +01:00
xeruf
d05c29332c test(calendar): use correct subdirectory to run server 2024-11-25 12:55:34 +01:00
5 changed files with 10 additions and 23 deletions

View file

@ -2,13 +2,13 @@ import express from 'express';
import path from 'path'; import path from 'path';
import routes from './routes.js'; import routes from './routes.js';
console.log(`Starting server in ${process.cwd()}`);
const app = express(); const app = express();
app.use(express.json()); app.use(express.json());
// Serve static files from the 'public' directory // Serve static files from the 'public' directory
app.use(express.static(path.join(process.cwd(), 'public'))); app.use(express.static(path.join(process.cwd(), 'public')));
app.use('/', routes); app.use('/', routes);
export default app;
export default app;

View file

@ -1,8 +1,6 @@
import request from 'supertest'; import request from 'supertest';
import express from 'express';
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import { jest } from '@jest/globals';
import { fileURLToPath } from 'url'; import { fileURLToPath } from 'url';
// ESM equivalent of __dirname // ESM equivalent of __dirname
@ -15,15 +13,12 @@ const EXPECTED_OUTPUTS_DIR = path.join(__dirname, 'expected_outputs');
let server; let server;
process.chdir(__dirname) process.chdir(__dirname)
// console.log(process.cwd()); const app = await import('../src/server');
import app from '../src/server.js';
const normalizeLineEndings = (str) => str.replace(/\r\n/g, '\r\n').trimEnd(); // Normalize to CRLF
describe('Calendar Merging API', () => { describe('Calendar Merging API', () => {
beforeAll(async () => { beforeAll(async () => {
// Start the server // Start the server
server = app.listen(0); server = app.default.listen(0);
}); });
afterAll(async () => { afterAll(async () => {
@ -66,12 +61,8 @@ describe('Calendar Merging API', () => {
const expectedOutput = fs.readFileSync(input, 'utf8'); const expectedOutput = fs.readFileSync(input, 'utf8');
const actualOutput = fs.readFileSync(filePath, 'utf8'); const actualOutput = fs.readFileSync(filePath, 'utf8');
// Normalize line endings
const normalizedActual = normalizeLineEndings(actualOutput);
const normalizedExpected = normalizeLineEndings(expectedOutput);
//compare //compare
expect(normalizedActual).toBe(normalizedExpected); expect(actualOutput).toBe(expectedOutput);
}); });
test('Preserve google calendar', async () => { test('Preserve google calendar', async () => {
@ -98,12 +89,8 @@ describe('Calendar Merging API', () => {
const expectedOutput = fs.readFileSync(input, 'utf8'); const expectedOutput = fs.readFileSync(input, 'utf8');
const actualOutput = fs.readFileSync(filePath, 'utf8'); const actualOutput = fs.readFileSync(filePath, 'utf8');
// Normalize line endings
const normalizedActual = normalizeLineEndings(actualOutput);
const normalizedExpected = normalizeLineEndings(expectedOutput);
//compare //compare
expect(normalizedActual).toBe(normalizedExpected); expect(actualOutput).toBe(expectedOutput);
}); });

View file

@ -13,4 +13,4 @@ UID:6tbrvsitniuu72li7kk15gou2b@google.com
SUMMARY:progodessey SUMMARY:progodessey
SEQUENCE:0 SEQUENCE:0
END:VEVENT END:VEVENT
END:VCALENDAR END:VCALENDAR

View file

@ -41,4 +41,4 @@ STATUS:CONFIRMED
SUMMARY:do SUMMARY:do
TRANSP:OPAQUE TRANSP:OPAQUE
END:VEVENT END:VEVENT
END:VCALENDAR END:VCALENDAR

View file

@ -30,4 +30,4 @@ RRULE:FREQ=WEEKLY;BYDAY=WE
SUMMARY:JR Weekly Check-In SUMMARY:JR Weekly Check-In
SEQUENCE:0 SEQUENCE:0
END:VEVENT END:VEVENT
END:VCALENDAR END:VCALENDAR