fix: fix existing tests

Author: cirex-web

src/parser/diningParser.ts

@@ -16,15 +16,20 @@ export default class DiningParser {
     "https://apps.studentaffairs.cmu.edu/dining/conceptinfo/Specials";
   static readonly DINING_SOUPS_URL =
     "https://apps.studentaffairs.cmu.edu/dining/conceptinfo/Soups";
-  locationOverwrites: ILocationCoordinateOverwrites;
-  timeSlotOverwrites: IAllTimeOverwrites;
+  locationCoordinateOverwrites: ILocationCoordinateOverwrites = {};
+  timeSlotOverwrites: IAllTimeOverwrites = {};
 
-  constructor(
-    locationOverwrites: ILocationCoordinateOverwrites,
-    timeSlotOverwrites: IAllTimeOverwrites
-  ) {
-    this.locationOverwrites = locationOverwrites;
-    this.timeSlotOverwrites = timeSlotOverwrites;
+  constructor(overwrites?: {
+    locationCoordinateOverwrites?: ILocationCoordinateOverwrites;
+    timeSlotOverwrites?: IAllTimeOverwrites;
+  }) {
+    if (overwrites?.locationCoordinateOverwrites !== undefined) {
+      this.locationCoordinateOverwrites =
+        overwrites.locationCoordinateOverwrites;
+    }
+    if (overwrites?.timeSlotOverwrites !== undefined) {
+      this.timeSlotOverwrites = overwrites.timeSlotOverwrites;
+    }
   }
 
   async process(): Promise<ILocation[]> {
@@ -39,7 +44,7 @@ export default class DiningParser {
       );
       builder.setSoup(soups);
       builder.setSpecials(specials);
-      builder.overwriteLocationCoordinates(this.locationOverwrites);
+      builder.overwriteLocationCoordinates(this.locationCoordinateOverwrites);
     }
 
     return locationBuilders.map((builder) => builder.build());

src/server.ts

@@ -16,10 +16,10 @@ let cachedLocations: ILocation[] = [];
 async function reload(): Promise<void> {
   const now = new Date();
   console.log(`Reloading Dining API: ${now}`);
-  const parser = new DiningParser(
+  const parser = new DiningParser({
     locationCoordinateOverwrites,
-    timeSlotOverwrites
-  );
+    timeSlotOverwrites,
+  });
   const locationMerger = new LocationMerger();
 
   for (let i = 0; i < env.NUMBER_OF_SCRAPES; i++) {

tests/integration.test.ts

@@ -1,3 +1,4 @@
+import locationCoordinateOverwrites from "overwrites/locationCoordinateOverwrites";
 import DiningParser from "../src/parser/diningParser";
 
 import { expectedLocationData } from "./expectedData";
@@ -26,7 +27,9 @@ test("the whole thing, including locationOverwrites", async () => {
         ? `html/concepts/${conceptId}.html`
         : "html/blank.html",
   });
-  const parser = new DiningParser();
+  const parser = new DiningParser({
+    locationCoordinateOverwrites: locationCoordinateOverwrites,
+  });
   const parsedLocationData = await parser.process();
   expect(parsedLocationData).toStrictEqual(expectedLocationData);
 });

tests/mockAxios.ts

@@ -1,3 +1,4 @@
+import { DateTime } from "luxon";
 import { getFileContent, last } from "./utils";
 import axios from "axios";
 
@@ -19,14 +20,19 @@ export function mockAxiosGETMethod({
   specialsHTML,
   soupsHTML,
   conceptHTML,
+  serverDate,
 }: {
   conceptListHTML?: string;
   specialsHTML?: string;
   soupsHTML?: string;
   conceptHTML?: (id: string) => string | undefined;
+  serverDate?: DateTime<true>;
 }) {
   (axios.get as jest.Mock).mockImplementation(async (url: string) => {
-    return { data: getHTML(url) };
+    return {
+      data: getHTML(url),
+      headers: { date: (serverDate ?? DateTime.now()).toRFC2822() },
+    };
   });
 
   const getHTML = (url: string) => {
@@ -48,11 +54,13 @@ export function mockAxiosGETMethodWithFilePaths({
   specialsFilePath,
   soupsFilePath,
   getConceptFilePath,
+  serverDate,
 }: {
   conceptListFilePath?: string;
   specialsFilePath?: string;
   soupsFilePath?: string;
   getConceptFilePath?: (conceptId: string) => string;
+  serverDate?: DateTime<true>;
 }) {
   mockAxiosGETMethod({
     conceptListHTML: getFileContent(conceptListFilePath),
@@ -62,5 +70,6 @@ export function mockAxiosGETMethodWithFilePaths({
       getConceptFilePath
         ? getFileContent(getConceptFilePath(conceptId))
         : undefined,
+    serverDate,
   });
 }