From 00c5d04153e7aea346308a4df82e68a8faf7dc3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Garapich?= <michal@garapich.pl>
Date: Fri, 2 Aug 2024 10:23:30 +0000
Subject: [PATCH] test(e2e): fix tests

---
 playwright.config.ts                        |  8 +++---
 src/queue/views/html/queue-slot.tsx         |  2 +-
 tests/10-queue/04-everybody-leaves.spec.ts  | 21 ++++++++++----
 tests/10-queue/05-late-for-ready-up.spec.ts | 32 ++++++++++++++-------
 tests/fixtures/auth-users.ts                |  1 +
 5 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/playwright.config.ts b/playwright.config.ts
index d428d224..9257b547 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -13,13 +13,13 @@ export default defineConfig<AuthUsersOptions>({
   /* Run tests in files in parallel */
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env['CI'],
+  forbidOnly: !!process.env.CI,
   /* Retry on CI only */
-  retries: process.env['CI'] ? 2 : 0,
+  retries: process.env.CI ? 2 : 0,
   /* Opt out of parallel tests on CI. */
-  workers: process.env['CI'] ? 1 : '50%',
+  workers: process.env.CI ? 1 : '50%',
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
+  reporter: process.env.CI ? 'github' : 'html',
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */
diff --git a/src/queue/views/html/queue-slot.tsx b/src/queue/views/html/queue-slot.tsx
index 0c0e243d..fef355ad 100644
--- a/src/queue/views/html/queue-slot.tsx
+++ b/src/queue/views/html/queue-slot.tsx
@@ -79,7 +79,7 @@ function PlayerInfo(props: {
   markAsFriendButtonState: MarkAsFriendButtonState | undefined
 }) {
   let slotButton = <></>
-  if (props.isActorsSlot) {
+  if (props.isActorsSlot && !props.ready) {
     slotButton = (
       <button class="leave-queue-button" name="leave" value="" aria-label="Leave queue">
         <IconMinus />
diff --git a/tests/10-queue/04-everybody-leaves.spec.ts b/tests/10-queue/04-everybody-leaves.spec.ts
index 8a8f9410..6959462b 100644
--- a/tests/10-queue/04-everybody-leaves.spec.ts
+++ b/tests/10-queue/04-everybody-leaves.spec.ts
@@ -1,16 +1,27 @@
 import { authUsers } from '../fixtures/auth-users'
+import { minutesToMilliseconds } from 'date-fns'
 
 authUsers('everybody leaves', async ({ steamIds, pages }) => {
+  authUsers.setTimeout(minutesToMilliseconds(2))
   const queueUsers = steamIds.slice(0, 12)
+  for (let i = 0; i < queueUsers.length; ++i) {
+    const steamId = queueUsers[i]!
+    const page = pages.get(steamId)!
+
+    // join the queue
+    await page.getByLabel(`Join queue on slot ${i}`, { exact: true }).click()
+  }
+
   await Promise.all(
-    queueUsers.map(async (steamId, i) => {
+    queueUsers.slice(0, -1).map(async steamId => {
       const page = pages.get(steamId)!
 
-      // join the queue
-      await page.getByLabel(`Join queue on slot ${i}`, { exact: true }).click()
-
-      // wait for ready-up
+      // don't ready up
       await page.getByRole('button', { name: `Can't play right now` }).click()
     }),
   )
+
+  // last player leaves
+  const page = pages.get(queueUsers[11]!)!
+  await page.getByLabel(`Leave queue`, { exact: true }).click({ timeout: minutesToMilliseconds(1) })
 })
diff --git a/tests/10-queue/05-late-for-ready-up.spec.ts b/tests/10-queue/05-late-for-ready-up.spec.ts
index 644cec07..231d7250 100644
--- a/tests/10-queue/05-late-for-ready-up.spec.ts
+++ b/tests/10-queue/05-late-for-ready-up.spec.ts
@@ -1,17 +1,18 @@
 import { authUsers, expect } from '../fixtures/auth-users'
+import { minutesToMilliseconds } from 'date-fns'
 
 authUsers('player is late for ready up', async ({ steamIds, pages, page }) => {
+  authUsers.setTimeout(minutesToMilliseconds(2))
   const queueUsers = steamIds.slice(0, 12)
-  await Promise.all(
-    queueUsers.map(async (steamId, i) => {
-      const page = pages.get(steamId)!
+  for (let i = 0; i < queueUsers.length; ++i) {
+    const steamId = queueUsers[i]!
+    const page = pages.get(steamId)!
 
-      // join the queue
-      await page.getByLabel(`Join queue on slot ${i}`, { exact: true }).click()
-    }),
-  )
+    // join the queue
+    await page.getByLabel(`Join queue on slot ${i}`, { exact: true }).click()
+  }
 
-  const readyUsers = queueUsers.slice(0, -1)
+  const readyUsers = queueUsers.slice(1, -1)
   await Promise.all(
     readyUsers.map(async user => {
       const page = pages.get(user)!
@@ -21,12 +22,21 @@ authUsers('player is late for ready up', async ({ steamIds, pages, page }) => {
     }),
   )
 
+  // player gets kicked
   await expect(page.getByRole('heading', { name: /^Players:/ })).toHaveText('Players: 11/12', {
     timeout: 60000,
   })
-
-  // player gets kicked
   await expect(
-    pages.get(queueUsers[11]!)!.getByLabel(`Join queue on slot 11`, { exact: true }),
+    pages.get(queueUsers[0]!)!.getByLabel(`Join queue on slot 0`, { exact: true }),
   ).toBeVisible()
+
+  // everybody leaves the queue
+  await Promise.all(
+    queueUsers.slice(1).map(async steamId => {
+      const page = pages.get(steamId)!
+      await page
+        .getByLabel(`Leave queue`, { exact: true })
+        .click({ timeout: minutesToMilliseconds(1) })
+    }),
+  )
 })
diff --git a/tests/fixtures/auth-users.ts b/tests/fixtures/auth-users.ts
index 9347c8cc..40aec188 100644
--- a/tests/fixtures/auth-users.ts
+++ b/tests/fixtures/auth-users.ts
@@ -48,6 +48,7 @@ export const authUsers = test.extend<AuthUsersOptions & AuthUsersFixture>({
     )
     await use(pages)
     for (const page of pages.values()) {
+      await page.context().close()
       await page.close()
     }
     pages.clear()