From 700d13b4d03428861f388de49c3f6790fbab7258 Mon Sep 17 00:00:00 2001
From: Eugen Istoc <ei2074@att.com>
Date: Tue, 28 Nov 2023 16:04:40 -0500
Subject: [PATCH] Fix queryClient.invalidateQueries call in useLeague.ts and
 update dev:test script in package.json

---
 composables/queries/useLeague.ts |  4 ++--
 package.json                     |  5 +++--
 tests/manage-leagues.spec.ts     | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/composables/queries/useLeague.ts b/composables/queries/useLeague.ts
index 283d9bc..626daaa 100644
--- a/composables/queries/useLeague.ts
+++ b/composables/queries/useLeague.ts
@@ -64,7 +64,7 @@ export const useLeague = () => {
         return res
       },
       onSuccess: ({ account }) => {
-        queryClient.invalidateQueries({ queryKey: ['account', account?.hash] })
+        queryClient.invalidateQueries({ queryKey: ['account', account.hash] })
       },
     })
   }
@@ -80,7 +80,7 @@ export const useLeague = () => {
         return res
       },
       onSuccess: ({ account, id }) => {
-        queryClient.invalidateQueries({ queryKey: ['account', account?.hash] })
+        queryClient.invalidateQueries({ queryKey: ['account', account.hash] })
         queryClient.removeQueries({ queryKey: ['league', id] })
       },
     })
diff --git a/package.json b/package.json
index 529b29e..3ba4a89 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "scripts": {
     "build": "prisma generate && prisma migrate deploy && nuxt build",
     "dev": "prisma migrate dev && nuxt dev",
-    "dev:test": "dotenv -e .env.test -- pnpm prisma migrate reset --force && prisma migrate dev && nuxt dev --dotenv .env.test --port 3001",
+    "dev:test": "dotenv -e .env.test -- prisma migrate dev && nuxt dev --dotenv .env.test --port 3001",
     "docker:up": "docker-compose up -d",
     "docker:down": "docker-compose down",
     "start": "node .output/server/index.mjs",
@@ -18,7 +18,8 @@
     "postinstall": "prisma generate",
     "playwright": "playwright",
     "prisma": "prisma",
-    "playwright:ui": "playwright test --ui"
+    "playwright:ui": "playwright test --ui",
+    "dotenv": "dotenv"
   },
   "prisma": {
     "schema": "server/prisma/schema.prisma"
diff --git a/tests/manage-leagues.spec.ts b/tests/manage-leagues.spec.ts
index 570165b..e3a8fee 100644
--- a/tests/manage-leagues.spec.ts
+++ b/tests/manage-leagues.spec.ts
@@ -2,49 +2,49 @@ import { test, expect } from '@playwright/test'
 import { execSync } from 'child_process'
 
 test.describe('Managing leagues', () => {
-  test.beforeAll(async () => execSync('pnpm prisma migrate reset --force'))
-  test.afterAll(async () => execSync('pnpm prisma migrate reset --force'))
+  test.beforeAll(async () => execSync('pnpm dotenv -e .env.test -- pnpm prisma migrate reset --force'))
+  test.afterAll(async () => execSync('pnpm dotenv -e .env.test -- pnpm prisma migrate reset --force'))
 
   test('creating first league', async ({ page }) => {
-    await page.goto('/')
-    await page.getByRole('button', { name: 'Setup a league' }).click()
+    await page.goto('/', { waitUntil: 'networkidle', timeout: 60000 })
+    await page.getByTestId('btn-setup-league').click()
     await page.getByPlaceholder('League name').click()
     await page.getByPlaceholder('League name').fill('La Liga')
     await page.getByRole('button', { name: 'Add League' }).click()
 
     // await expect
-    await expect(page.locator('[data-test="league-dropdown-button"]')).toContainText('La Liga')
+    await expect(page.getByTestId('league-dropdown-button')).toContainText('La Liga')
   })
 
   test('deleting a league', async ({ page }) => {
     // Create a league
-    await page.goto('/')
-    await page.getByRole('button', { name: 'Setup a league' }).click()
+    await page.goto('/', { waitUntil: 'networkidle', timeout: 60000 })
+    await page.getByTestId('btn-setup-league').click()
     await page.getByPlaceholder('League name').click()
     await page.getByPlaceholder('League name').fill('La Liga')
     await page.getByRole('button', { name: 'Add League' }).click()
 
     // Delete the league
-    await page.locator('[data-test="league-dropdown-button"]').click()
+    await page.getByTestId('league-dropdown-button').click()
     await page.getByRole('menuitem', { name: 'Delete this league' }).click()
     await page.getByRole('button', { name: 'Yes' }).click()
 
-    await expect(page.locator('[data-test="league-dropdown-button"]')).toContainText('Select League')
+    await expect(page.getByTestId('league-dropdown-button')).toContainText('Select League')
   })
 
   test('duplicate a league', async ({ page }) => {
     // Create a league
-    await page.goto('/')
+    await page.goto('/', { waitUntil: 'networkidle', timeout: 60000 })
     await page.getByRole('button', { name: 'Setup a league' }).click()
     await page.getByPlaceholder('League name').click()
     await page.getByPlaceholder('League name').fill('La Liga')
     await page.getByRole('button', { name: 'Add League' }).click()
 
     // Duplicate the league
-    await page.locator('[data-test="league-dropdown-button"]').click()
+    await page.getByTestId('league-dropdown-button').click()
     await page.getByRole('menuitem', { name: 'Duplicate League' }).click()
 
-    await expect(page.locator('[data-test="league-dropdown-button"]')).toContainText('La Liga (copy)')
+    await expect(page.getByTestId('league-dropdown-button')).toContainText('La Liga (copy)')
   })
 
   test('creating a new league from menu', async ({ page }) => {})