src/server.js

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

test/calendar.test.js

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