fix tests

Author: debater-coder

apps/client/package.json

@@ -1,19 +1,18 @@
 {
   "name": "client",
   "version": "1.9.9-beta",
+  "type": "module",
   "scripts": {
     "dev": "npm-run-all --parallel dev:*",
     "dev:run": "FORCE_COLOR=1 vite",
-    "dev:test": "FORCE_COLOR=1 vitest watch --ui --coverage",
+    "dev:test": "vitest --ui",
     "build": "FORCE_COLOR=1 vite build",
     "preview": "vite preview",
     "format": "prettier --ignore-path .gitignore --write .",
     "check-format": "prettier . --list-different",
     "lint": "eslint . --ignore-path .gitignore",
     "check-types": "tsc --pretty",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "validate": "npm-run-all --parallel check-types lint check-format build test",
+    "validate": "npm-run-all --parallel check-types lint check-format build",
     "setup": "pnpm install && pnpm validate"
   },
   "dependencies": {
@@ -66,16 +65,15 @@
     "@types/react": "^18.0.21",
     "@typescript-eslint/eslint-plugin": "^5.60.0",
     "@typescript-eslint/parser": "^5.60.0",
-    "@vitejs/plugin-react": "^3.0.0",
-    "@vitest/coverage-v8": "^0.33.0",
-    "@vitest/ui": "^0.32.2",
+    "@vitejs/plugin-react": "^4.2.1",
+    "@vitest/ui": "^1.2.2",
     "eslint": "^8.43.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-react": "^7.32.2",
     "jsdom": "^22.1.0",
     "npm-run-all": "^4.1.5",
     "prettier": "2.6.2",
-    "vite": "^4.1.5",
-    "vitest": "^0.32.2"
+    "vite": "^5.0.12",
+    "vitest": "^1.2.2"
   }
 }

apps/client/src/interfaces/DataProvider.ts

@@ -8,9 +8,10 @@ export type LongOrShortString = {
 export type Period = {
   start: DateTime;
   end: DateTime;
+  name: LongOrShortString;
   teacher?: LongOrShortString;
-  name?: LongOrShortString;
   location?: LongOrShortString;
+  color?: string;
 };
 
 export const ContentEncodings = ["html", "markdown"] as const;

apps/client/src/services/dataProviders/TestDataProvider/TestDataProvider.ts

@@ -1,4 +1,5 @@
 import { DataProvider } from "../../../interfaces/DataProvider";
+import { DateTime } from "luxon";
 import { z } from "zod";
 
 export class TestDataProvider implements DataProvider {
@@ -34,4 +35,31 @@ export class TestDataProvider implements DataProvider {
       return barcode;
     },
   };
+
+  dtt = {
+    fetch: async () => undefined,
+    parse: (data: unknown) => [
+      {
+        start: DateTime.fromISO("2023-09-20T09:00:00.000Z"),
+        end: DateTime.fromISO("2023-09-20T10:00:00.000Z"),
+        name: { short: "8LAT1", long: "8 Latin 1" },
+        teacher: { short: "JSM", long: "Mr Smith" },
+        location: { short: "203", long: "Room 203" },
+        color: "#79f2cc",
+      },
+      {
+        start: DateTime.fromISO("2023-09-20T10:05:00.000Z"),
+        end: DateTime.fromISO("2023-09-20T11:05:00.000Z"),
+        name: { short: "8MA1", long: "8 Math 1" },
+        teacher: { short: "JBA", long: "Ms Bash" },
+        location: { short: "103", long: "Room 103" },
+        color: "#f28579",
+      },
+      {
+        start: DateTime.fromISO("2023-09-20T11:10:00.000Z"),
+        end: DateTime.fromISO("2023-09-20T11:40:00.000Z"),
+        name: { short: "RCS", long: "Recess" },
+      },
+    ],
+  };
 }

apps/client/vite.config.ts

@@ -2,7 +2,8 @@ import replace from "@rollup/plugin-replace";
 import { sentryVitePlugin } from "@sentry/vite-plugin";
 import react from "@vitejs/plugin-react";
 import { injectManifest } from "rollup-plugin-workbox";
-import { defineConfig } from "vitest/config";
+/// <reference types="vitest" />
+import { defineConfig } from "vite";
 
 export default defineConfig({
   plugins: [
@@ -41,9 +42,6 @@ export default defineConfig({
     port: 3000,
     strictPort: true,
   },
-  test: {
-    environment: "jsdom",
-  },
   preview: {
     port: 3000,
   },