try to fix flaky xhtml & import (axonivy#829)

Author: ivy-lmu

playwright/tests/import-process.spec.ts

@@ -1,4 +1,4 @@
-import { test } from './fixtures/baseTest';
+import { expect, test } from './fixtures/baseTest';
 import { FileExplorer } from './page-objects/explorer-view';
 import { ProcessEditor } from './page-objects/process-editor';
 
@@ -10,6 +10,8 @@ test('Import BPMN Process', async ({ page }) => {
 
   await explorer.selectNode('resources');
   await explorer.selectNode('all_elements_diagram.bpmn');
+  await expect(processEditor.editorContent()).toContainText('<bpmn:category id=');
   await explorer.importBpmnProcess('resources/all_elements_diagram.bpmn');
+  await explorer.executeCommand('Refresh Explorer');
   await explorer.hasNode(`all_elements_diagram.p.json`);
 });

playwright/tests/page-objects/explorer-view.ts

@@ -3,10 +3,7 @@ import path from 'path';
 import { View, type ViewData } from './view';
 
 export abstract class ExplorerView extends View {
-  constructor(
-    private viewName: string,
-    page: Page
-  ) {
+  constructor(private viewName: string, page: Page) {
     const data: ViewData = {
       tabSelector: `div.pane-header:has-text("${viewName}")`,
       viewSelector: ''
@@ -100,8 +97,7 @@ export class FileExplorer extends ExplorerView {
   }
 
   async importBpmnProcess(bpmnXml: string) {
-    await this.executeCommand('Axon Ivy: Import BPMN Process');
-    await this.provideUserInput(bpmnXml);
+    await this.executeCommand('Axon Ivy: Import BPMN Process', bpmnXml);
   }
 
   async addUserDialog(dialogName: string, namespace: string, kind: 'Html Dialog (JSF)' | 'Offline Dialog (JSF)' | 'Dialog Form') {

playwright/tests/page-objects/page-object.ts

@@ -13,7 +13,7 @@ export class PageObject {
       await this.page.locator(`.quick-input-list-entry:has-text("${command}")`).nth(0).click({ force: true, timeout: 100 });
     }).toPass();
     for (const userInput of userInputs) {
-      this.provideUserInput(userInput);
+      await this.provideUserInput(userInput);
     }
   }
 

playwright/tests/page-objects/xhtml-editor.ts

@@ -1,11 +1,18 @@
-import { type Locator, type Page } from '@playwright/test';
+import { expect, type Locator, type Page } from '@playwright/test';
 import { Editor } from './editor';
 
 export class XhtmlEditor extends Editor {
   readonly complitions: Locator;
-  
+
   constructor(page: Page, editorFile = 'testXhtml.xhtml') {
     super(editorFile, page);
     this.complitions = page.locator('.suggest-widget');
   }
+
+  async expectCompletionAtLineColumn(completion: string, line: number, column: number) {
+    await this.executeCommand('Go to Line/Column...', `:${line}:${column}`);
+    await expect(this.page.locator('a.statusbar-item-label').getByText(`Ln ${line}, Col ${column}`)).toBeVisible();
+    await this.executeCommand('Trigger Suggest');
+    await expect(this.complitions.getByText(completion)).toBeVisible();
+  }
 }

playwright/tests/xhtml-editors.spec.ts

@@ -1,40 +1,11 @@
-import { expect, test } from './fixtures/baseTest';
+import { test } from './fixtures/baseTest';
 import { XhtmlEditor } from './page-objects/xhtml-editor';
 
-  test('primeface tag completion', async ({ page }) => {
-    const editor = new XhtmlEditor(page);
-    await editor.hasNoStatusMessage();
-    await editor.openEditorFile();
-    await page.getByText('<p:messages').click();
-    await page.keyboard.press('Control+Space');
-    await expect(editor.complitions).toBeVisible();
-    await expect(editor.complitions.getByText('p:media')).toBeVisible();
-  });
-
-  test('primeface attr completion', async ({ page }) => {
-    const editor = new XhtmlEditor(page);
-    await editor.hasNoStatusMessage();
-    await editor.openEditorFile();
-    await page.getByText('<p:messages />').click();
-    await page.keyboard.press('End');
-    await page.keyboard.press('ArrowLeft+ArrowLeft');
-    await page.keyboard.press('Control+Space');
-    await expect(editor.complitions).toBeVisible();
-    await expect(editor.complitions.getByText('rendered')).toBeVisible();
-  });
-
-  test('htmlBasic tag completion', async ({ page }) => {
-    const editor = new XhtmlEditor(page);
-    await editor.hasNoStatusMessage();
-    await editor.openEditorFile();
-    await page.getByText('<h:form').click();
-    await page.keyboard.press('Home');
-    await page.keyboard.press('ArrowRight+ArrowRight');
-    await page.keyboard.press('Control+Space');
-    await expect(editor.complitions).toBeVisible();
-    await expect(editor.complitions.getByText('h:body')).toBeVisible();
-  });
-
-
-
-
+test('xhtml completions', async ({ page }) => {
+  const editor = new XhtmlEditor(page);
+  await editor.hasDeployProjectStatusMessage();
+  await editor.openEditorFile();
+  await editor.expectCompletionAtLineColumn('p:media', 18, 11);
+  await editor.expectCompletionAtLineColumn('rendered', 18, 19);
+  await editor.expectCompletionAtLineColumn('h:body', 17, 6);
+});