From 16795874f981539bc6f24a7bc130f0b1ae56a167 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Garapich?= <michal@garapich.pl>
Date: Tue, 6 Aug 2024 15:30:12 +0000
Subject: [PATCH] test(e2e): use QueuePage in launchGame fixture

---
 tests/fixtures/launch-game.ts | 10 +++++-----
 tests/pages/queue.page.ts     | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/tests/fixtures/launch-game.ts b/tests/fixtures/launch-game.ts
index 9ac9715a..a0403afc 100644
--- a/tests/fixtures/launch-game.ts
+++ b/tests/fixtures/launch-game.ts
@@ -4,6 +4,7 @@ import { Mutex } from 'async-mutex'
 import { GamePage } from '../pages/game.page'
 import { mergeTests } from '@playwright/test'
 import { simulateGameServer } from './simulate-game-server'
+import { QueuePage } from '../pages/queue.page'
 
 export const launchGame = mergeTests(authUsers, simulateGameServer).extend<{
   gameNumber: number
@@ -19,20 +20,19 @@ export const launchGame = mergeTests(authUsers, simulateGameServer).extend<{
     const mutex = new Mutex()
     await Promise.all(
       queueUsers.map(async (user, i) => {
-        const page = pages.get(user)!
+        const page = new QueuePage(pages.get(user)!)
 
         await mutex.runExclusive(async () => {
-          // join the queue
-          await page.getByLabel(`Join queue on slot ${i}`, { exact: true }).click()
+          await page.slot(i).join()
         })
 
         // last player joining the queue is ready by default
         if (i !== 11) {
           // wait for ready-up
-          await page.getByRole('button', { name: `I'M READY` }).click()
+          await page.readyUpDialog().readyUp()
         }
 
-        await page.waitForURL(/games\/(\d+)/)
+        await page.page.waitForURL(/games\/(\d+)/)
       }),
     )
 
diff --git a/tests/pages/queue.page.ts b/tests/pages/queue.page.ts
index 66f49c21..66dca4fc 100644
--- a/tests/pages/queue.page.ts
+++ b/tests/pages/queue.page.ts
@@ -11,6 +11,14 @@ class QueueSlot {
     this.locator = this.page.getByLabel(`Queue slot ${this.slotNumber}`, { exact: true })
   }
 
+  joinButton() {
+    return this.page.getByLabel(`Join queue on slot ${this.slotNumber}`, { exact: true })
+  }
+
+  async join() {
+    await this.joinButton().click()
+  }
+
   markAsFriendButton() {
     return this.locator.getByRole('button', { name: 'Mark as friend' })
   }
@@ -29,7 +37,7 @@ class ReadyUpDialog {
 }
 
 export class QueuePage {
-  constructor(private readonly page: Page) {}
+  constructor(public readonly page: Page) {}
 
   async goto() {
     await this.page.goto('/')
@@ -43,6 +51,10 @@ export class QueuePage {
     await this.page.getByLabel(`Leave queue`, { exact: true }).click({ timeout })
   }
 
+  slot(slot: number) {
+    return new QueueSlot(this.page, slot)
+  }
+
   queueSlot(slot: number) {
     return this.page.getByLabel(`Queue slot ${slot}`, { exact: true })
   }