From 983d39d46f10fab14298aaf34a61676b7f1f1a24 Mon Sep 17 00:00:00 2001
From: Juha Paananen <juha.paananen@gmail.com>
Date: Sun, 18 Feb 2024 17:51:37 +0200
Subject: [PATCH] Remove the data-test attribute in items, used in Playwright
 tests

Easy to avoid storing this extra info in the DOM
---
 frontend/src/board/ItemView.tsx   | 12 ------------
 playwright/src/pages/BoardPage.ts |  8 +++-----
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/frontend/src/board/ItemView.tsx b/frontend/src/board/ItemView.tsx
index 539e7a6e8..3d3b1a082 100644
--- a/frontend/src/board/ItemView.tsx
+++ b/frontend/src/board/ItemView.tsx
@@ -80,17 +80,6 @@ export const ItemView = ({
         dispatch,
     )
 
-    const dataTest = L.combineTemplate({
-        text: L.view(item, (i) => (i.type === "note" || i.type === "text" ? i.text : "")),
-        type: L.view(item, "type"),
-        selected,
-    }).pipe(
-        L.map(({ text, selected, type }: { text: string; selected: boolean; type: ItemType }) => {
-            const textSuffix = text ? "-" + text : ""
-            return selected ? `${type}-selected${textSuffix}` : `${type}${textSuffix}`
-        }),
-    )
-
     function itemPadding(i: Item) {
         if (i.type != "note") return undefined
 
@@ -109,7 +98,6 @@ export const ItemView = ({
         <span
             title={L.view(isLocked, (l) => (l ? "Item is selected by another user" : ""))}
             ref={ref}
-            data-test={dataTest}
             data-itemid={id}
             draggable={L.view(itemFocus, (f) => f !== "editing")}
             onClick={onClick}
diff --git a/playwright/src/pages/BoardPage.ts b/playwright/src/pages/BoardPage.ts
index 1f45ef876..207d0353a 100644
--- a/playwright/src/pages/BoardPage.ts
+++ b/playwright/src/pages/BoardPage.ts
@@ -104,7 +104,6 @@ export function BoardPage(page: Page) {
         },
         async createNoteWithText(x: number, y: number, text: string) {
             await createNew(this.newNoteOnPalette, x, y)
-            await expect(this.getNote("HELLO")).toBeVisible()
             await page.keyboard.type(`${text}`)
             await page.keyboard.press("Escape")
             await expect(this.getNote(text)).toBeVisible()
@@ -112,7 +111,6 @@ export function BoardPage(page: Page) {
         },
         async createText(x: number, y: number, text: string) {
             await createNew(this.newTextOnPalette, x, y)
-            await expect(this.getText("HELLO")).toBeVisible()
             await page.keyboard.type(`${text}`)
             await expect(this.getText(text)).toBeVisible()
             return this.getText(text)
@@ -132,13 +130,13 @@ export function BoardPage(page: Page) {
             await dragElementOnBoard(bottomCorner, x, y)
         },
         getNote(name: string) {
-            return page.locator(`[data-test^="note"][data-test*="${name}"]`)
+            return page.locator(`.board > .note`).filter({ hasText: name })
         },
         getText(name: string) {
-            return page.locator(`[data-test^="text"][data-test*="${name}"]`)
+            return page.locator(`.board > .text`).filter({ hasText: name })
         },
         getArea(name: string) {
-            return page.locator(`[data-test^="container"]`).filter({ hasText: name })
+            return page.locator(`.board > .container`).filter({ hasText: name })
         },
         async assertItemPosition(item: Locator, x: number, y: number) {
             const pos = await getElementPosition(item)