test: fix the test-classic-4-lite.koboldai.net.spec.ts

static/tests/test-classic-4-lite.koboldai.net.spec.ts

@@ -4,6 +4,7 @@ import {
     ensureThesaurusPanelClosed,
     ensureThesaurusPanelOpen,
     fillInputFieldWithString,
+    handleDialogWithExpectedMessage,
     initTest
 } from './test-helper';
 
@@ -51,13 +52,8 @@ test(`test My Ghost Writer: backend request - word with no synonyms, then add a
     await page.getByRole('button', { name: 'thesaurus-custom-button-internal0' }).click();
     // try to submit immediately, we'll get an error because we didn't filled the forms
     console.log("#")
-    await page.getByRole('button', { name: 'thesaurus-custom-submit' }).click();
-    page.once('dialog', dialog1 => {
-      const msg1 = dialog1.message()
-      // expect(msg1).toContain("Please enter a word.")
-      console.error(`Dialog message: '${msg1}'`); // Dialog message: Please enter a word.
-      dialog1.dismiss().catch(() => {});
-    });
+    const thesaurusCustomSubmitBtn = page.getByRole('button', { name: 'thesaurus-custom-submit' })
+    await handleDialogWithExpectedMessage({page, locator: thesaurusCustomSubmitBtn, expectedText: "Please enter a word."})
     await page.waitForTimeout(200)
 
     await page.getByRole('button', { name: 'thesaurus-custom-cancel' }).click(); // close the thesaurus custom form
@@ -84,17 +80,8 @@ test(`test My Ghost Writer: backend request - word with no synonyms, then add a
     await expect(page.getByLabel('thesaurus-custom-form-content')).toMatchAriaSnapshot({ name: `test-classic-4-0-wordsearch_results-2-${projectName}-${state}.txt` });
     await page.getByRole('textbox', { name: 'thesaurus-custom-related-words-2nth' }).click();
     await page.getByRole('textbox', { name: 'thesaurus-custom-related-words-2nth' }).fill('joyful,happyness,content');
-    // handle second dialog message
-    page.once('dialog', dialog2 => {
-      const msg2 = dialog2.message()
-      // expect(msg2).toContain("Thesaurus entry added successfully!")
-      console.error(`Dialog message: '${msg2}'`); // Dialog message: Thesaurus entry added successfully!
-      dialog2.dismiss().catch(() => {});
-    });
-    await page.waitForTimeout(200)
 
-    // submit the form content
-    await page.getByRole('button', { name: 'thesaurus-custom-submit' }).click();
+    await handleDialogWithExpectedMessage({page, locator: thesaurusCustomSubmitBtn, expectedText: "Thesaurus entry added successfully!"})
     await page.waitForTimeout(200)
 
     await ensureThesaurusPanelClosed(page);

static/tests/test-helper.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import * as crypto from "node:crypto";
-import { Locator, Page, TestInfo, expect } from '@playwright/test';
+import { Dialog, Locator, Page, TestInfo, expect } from '@playwright/test';
 
 interface CellObject {
   table: number
@@ -481,4 +481,30 @@ export async function deleteCustomSynonym(word: string) {
     // Re-throw the error if you want calling functions to handle it.
     throw error;
   }
+}
+export async function handleDialogWithExpectedMessage({page, locator, expectedText}: {page: Page, locator: Locator, expectedText: string}) {
+  // Set up the dialog handler before clicking
+  const dialogPromise = page.waitForEvent('dialog', { timeout: 200 });
+
+  // Trigger the action that should show the dialog
+  try {
+    await locator.click({timeout: 100});
+  } catch(err0) {
+    console.error(`handleDialogWithExpectedMessage::error on dismissing dialog:'${err0}'`)
+  }
+  // Wait for and handle the dialog
+  const dialog = await dialogPromise;
+  const message = dialog.message();
+
+  console.log(`Dialog message: "${message}"`);
+
+  // Assert the message content
+  expect(message).toContain(expectedText);
+
+  // Dismiss the dialog
+  dialog.dismiss().catch((err1) => {console.error(`handleDialogWithExpectedMessage::error on dismissing dialog:'${err1}'`)});
+
+  // Wait a bit to ensure the dialog is fully dismissed
+  await page.waitForTimeout(100);
+
 }