test: fix tests

Author: stefanvanherwijnen

packages/api/package.json

@@ -80,7 +80,7 @@
     "@faker-js/faker": "^10.1.0",
     "@iconify-json/flagpack": "^1.2.6",
     "@iconify-json/mdi": "^1.2.3",
-    "@playwright/test": "1.57.0",
+    "@playwright/test": "1.58.2",
     "@types/bcryptjs": "^3.0.0",
     "@types/oidc-provider": "^9.5.0",
     "@types/pg": "^8.15.6",

packages/api/src/kysely/seeds/test.ts

@@ -8,6 +8,8 @@ import {
   SERVICE_TYPE
 } from '../types.js'
 
+const CURRENT_YEAR = new Date().getFullYear()
+
 const seed = async () => {
   const accounts = [1, 2, 3, 4, 5].map((nr) => ({
     email: `test${nr}@petboarding.app`
@@ -49,11 +51,22 @@ const seed = async () => {
     endTimeId: 1,
     customerId: nr
   }))
+  bookings.push({
+    startDate: `${CURRENT_YEAR}-01-01`,
+    endDate: `${CURRENT_YEAR}-01-11`,
+    startTimeId: 1,
+    endTimeId: 1,
+    customerId: 5
+  })
 
   const bookingPet = [1, 2, 3, 4, 5].map((nr) => ({
     bookingId: nr,
     petId: nr
   }))
+  bookingPet.push({
+    bookingId: 6,
+    petId: 5
+  })
 
   const bookingStatuseEnum = [
     BOOKING_STATUS.PENDING,
@@ -74,10 +87,18 @@ const seed = async () => {
     ...bookings[nr - 1],
     bookingId: nr,
     status: bookingStatuseEnum[nr - 1],
-    petIds: `[${nr}]`,
+    petIds: `[${nr - 1}]`,
     modifiedAt: new Date().toISOString(),
     customerId: undefined
   }))
+  bookingStatuses.push({
+    ...bookings[5],
+    bookingId: 6,
+    status: bookingStatuseEnum[0],
+    petIds: `[${5}]`,
+    modifiedAt: new Date().toISOString(),
+    customerId: undefined
+  })
 
   const daycareDates = [1, 2, 3, 4, 5].map((nr) => ({
     date: `2024-02-0${nr}`,

packages/api/tests/e2e/administrator/administrator.spec.ts

@@ -4,6 +4,7 @@ import { initializeAndLogin } from '../setup'
 
 // import { format } from 'date-fns'
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+const CURRENT_YEAR = new Date().getFullYear()
 
 const email = 'admin@petboarding.app'
 const password = 'qjiNWdT8L'
@@ -41,15 +42,15 @@ test.describe('Bookings', async () => {
     await page.goto('admin/bookings')
     await page.waitForLoadState('networkidle')
 
-    await expect(page.getByText('name1 lastName1')).toBeVisible()
+    await expect(page.getByText('name5 lastName5')).toBeVisible()
   })
 })
 test.describe('Occupancy', async () => {
   test('Check booking occupancy', async () => {
-    await page.goto('admin/occupancy/2024-01-01')
+    await page.goto(`admin/occupancy/2024-01-01`)
     await page.waitForLoadState('networkidle')
 
-    await page.getByText('2024/01/01').isVisible()
+    await page.getByText(`2024/01/01`).isVisible()
     await expect(
       page
         .locator('div:nth-child(2) > .q-calendar-month__day--content > .column')
@@ -58,10 +59,10 @@ test.describe('Occupancy', async () => {
   })
 
   test('Check daycare occupancy', async () => {
-    await page.goto('admin/occupancy/2024-02-01')
+    await page.goto(`admin/occupancy/2024-02-01`)
     await page.waitForLoadState('networkidle')
 
-    await page.getByText('2024/02/01').isVisible()
+    await page.getByText(`2024/02/01`).isVisible()
     await expect(
       page
         .locator('div:nth-child(5) > .q-calendar-month__day--content > .column')