@sun-asterisk/sungen 1.0.19 → 1.0.21

package/src/core/live-scanner/scanner.ts

@@ -9,6 +9,7 @@ import { glob } from 'glob';
 import { LiveScanResult, LiveScanScenario, LiveScanOptions } from './types';
 import { replaySteps } from './step-replayer';
 import { writeMatrix } from './matrix-writer';
+import { readMatrix, mergeMatrixElements } from './matrix-reader';
 import { readBaseUrlFromPlaywrightConfig } from './config-reader';
 
 export class LiveScanner {
@@ -68,9 +69,19 @@ export class LiveScanner {
         const featureName = path.basename(featureFile, '.feature');
         console.log(`\n📄 Scanning feature: ${featureName}`);
 
+        // Load existing matrix for incremental scan (non-force mode)
+        let existingResult: LiveScanResult | null = null;
+        if (!this.options.force) {
+          const matrixPath = path.join(selectorsDir, `${featureName}.live-scan.yaml`);
+          existingResult = readMatrix(matrixPath);
+          if (existingResult) {
+            console.log(`   📦 Found existing scan — resolved elements will be skipped`);
+          }
+        }
+
         try {
           const parsed = parser.parseFeatureFile(featureFile);
-          const result = await this.scanFeature(browser, playwright, parsed, baseUrl);
+          const result = await this.scanFeature(browser, playwright, parsed, baseUrl, existingResult);
           results.push(result);
 
           // Write matrix file
@@ -112,11 +123,15 @@ export class LiveScanner {
     browser: any,
     playwright: any,
     feature: any,
-    baseUrl: string
+    baseUrl: string,
+    existingResult?: LiveScanResult | null
   ): Promise<LiveScanResult> {
     const featurePath = feature.path || '/';
     const scenarios: Record<string, LiveScanScenario> = {};
 
+    // Build merged existing elements map for skip logic
+    const existingElements = existingResult ? mergeMatrixElements(existingResult) : undefined;
+
     // Build a map of @steps scenarios for resolution
     const stepsMap = new Map<string, any>();
     for (const scenario of feature.scenarios) {
@@ -167,7 +182,7 @@ export class LiveScanner {
       const page = await context.newPage();
 
       try {
-        const result = await replaySteps(page, steps, featurePath, baseUrl);
+        const result = await replaySteps(page, steps, featurePath, baseUrl, existingElements);
 
         scenarios[scenarioKey] = {
           auth: authRole,
@@ -178,6 +193,9 @@ export class LiveScanner {
 
         // Print element summary
         const elementCount = Object.keys(result.elements).length;
+        const skipped = Object.values(result.elements).filter(
+          (e: any) => e.skipped
+        ).length;
         const resolved = Object.values(result.elements).filter(
           (e: any) => e.matchMethod !== 'unresolved'
         ).length;
@@ -185,7 +203,8 @@ export class LiveScanner {
           (e: any) => e.warning
         ).length;
 
-        console.log(`   📊 Elements: ${resolved}/${elementCount} resolved${warnings > 0 ? `, ${warnings} warnings` : ''}`);
+        const skippedInfo = skipped > 0 ? `, ${skipped} cached` : '';
+        console.log(`   📊 Elements: ${resolved}/${elementCount} resolved${skippedInfo}${warnings > 0 ? `, ${warnings} warnings` : ''}`);
 
         for (const error of result.errors) {
           console.log(`   ⚠️  ${error}`);
@@ -193,6 +212,10 @@ export class LiveScanner {
 
         // Print per-element status
         for (const [key, el] of Object.entries(result.elements) as any) {
+          if (el.skipped) {
+            // Already printed in replaySteps
+            continue;
+          }
           if (el.matchMethod === 'unresolved') {
             console.log(`      ✗ [${el.gherkinRef}] ${el.gherkinType} → NOT FOUND`);
           } else if (el.warning) {

package/src/core/live-scanner/step-replayer.ts

@@ -31,12 +31,33 @@ export async function replaySteps(
   page: Page,
   steps: ParsedStepInfo[],
   featurePath: string,
-  baseUrl: string
+  baseUrl: string,
+  existingElements?: Record<string, LiveElement>
 ): Promise<ReplayResult> {
   const elements: Record<string, LiveElement> = {};
   const errors: string[] = [];
   let currentContext: ElementContext = 'page';
 
+  // Pre-scan: detect which base keys have multiple normalized element types
+  // so we can append --type suffix (matching scaffold generator behavior)
+  // Uses normalizeElementType to match scaffold generator's extractTargetType mapping
+  // e.g. modal/dialog both normalize to 'dialog', so they won't create a false conflict
+  const typesPerKey = new Map<string, Set<string>>();
+  for (const step of steps) {
+    if (!step.selectorRef) continue;
+    const baseKey = generateElementKey(step.selectorRef, step.elementType, step.nth);
+    const action = detectAction(step.text);
+    const normalizedType = normalizeElementType(step.elementType || 'button', action);
+    if (!typesPerKey.has(baseKey)) {
+      typesPerKey.set(baseKey, new Set());
+    }
+    typesPerKey.get(baseKey)!.add(normalizedType);
+  }
+  const conflictKeys = new Set<string>();
+  for (const [key, types] of typesPerKey) {
+    if (types.size > 1) conflictKeys.add(key);
+  }
+
   for (const step of steps) {
     try {
       const action = detectAction(step.text);
@@ -46,7 +67,9 @@ export async function replaySteps(
         await page.goto(baseUrl + featurePath, { waitUntil: 'networkidle', timeout: 15000 });
         await settle(page);
         if (step.selectorRef) {
-          const key = generateElementKey(step.selectorRef, step.elementType);
+          const baseKey = generateElementKey(step.selectorRef, step.elementType, step.nth);
+          const normalizedType = normalizeElementType(step.elementType || 'page', action);
+          const key = conflictKeys.has(baseKey) ? `${baseKey}--${normalizedType}` : baseKey;
           // Record the page element but don't search for it on the DOM
           elements[key] = {
             gherkinRef: step.selectorRef,
@@ -71,9 +94,36 @@ export async function replaySteps(
       // Skip steps without element references
       if (!step.selectorRef) continue;
 
-      const key = generateElementKey(step.selectorRef, step.elementType);
-      const nth = step.nth || 0;
+      const baseKey = generateElementKey(step.selectorRef, step.elementType, step.nth);
       const elementType = step.elementType || 'button';
+      const normalizedType = normalizeElementType(elementType, action);
+      const key = conflictKeys.has(baseKey) ? `${baseKey}--${normalizedType}` : baseKey;
+      const nth = step.nth || 0;
+
+      // Skip column-type elements — they use header text matching, no DOM lookup needed
+      if (normalizedType === 'column') {
+        console.log(`      ⏭️  [${step.selectorRef}] column → skipped (table header match)`);
+        continue;
+      }
+
+      // Skip if element already resolved in existing scan (non-force mode)
+      if (existingElements && existingElements[key] && existingElements[key].matchMethod !== 'unresolved') {
+        elements[key] = existingElements[key];
+        (elements[key] as any).skipped = true;
+        console.log(`      ⏩ [${step.selectorRef}] ${elementType} → cached (${existingElements[key].selectorType})`);
+
+        // Still execute clicks for cached elements to maintain page state
+        if (action === 'click') {
+          try {
+            await executeClick(page, step.selectorRef, elementType, nth);
+            await settle(page);
+            currentContext = await detectCurrentContext(page, currentContext, step.text);
+          } catch {
+            // Click failed for cached element, continue anyway
+          }
+        }
+        continue;
+      }
 
       // Find the element on the page
       const element = await findElement(page, step.selectorRef, elementType, nth);
@@ -208,10 +258,46 @@ async function settle(page: Page): Promise<void> {
   await page.waitForTimeout(300);
 }
 
-function generateElementKey(ref: string, elementType?: string): string {
+function generateElementKey(ref: string, elementType?: string, nth?: number): string {
   // Use the same key generation as the scaffold generator
   // so live-scan keys match scaffold keys in the map command.
-  return SelectorResolver.generateKey(ref);
+  // Append --N suffix for nth > 0, consistent with scaffold generator format.
+  const baseKey = SelectorResolver.generateKey(ref);
+  return nth && nth > 0 ? `${baseKey}--${nth}` : baseKey;
+}
+
+/**
+ * Normalize element type to match scaffold generator's extractTargetType() mapping.
+ * e.g. modal→dialog, img/icon/logo→img, input→field, select→dropdown, etc.
+ */
+function normalizeElementType(elementType: string, action: string): string {
+  const t = elementType.toLowerCase();
+  if (t === 'page') return 'page';
+  if (t === 'link') return 'link';
+  if (t === 'button') return 'button';
+  if (t === 'radio') return 'radio';
+  if (t === 'dropdown' || t === 'select') return 'dropdown';
+  if (t === 'checkbox') return 'checkbox';
+  if (t === 'field' || t === 'input') return 'field';
+  if (t === 'textbox') return 'textbox';
+  if (t === 'textarea') return 'textarea';
+  if (t === 'text') return 'text';
+  if (t === 'label') return 'label';
+  if (t === 'uploader') return 'uploader';
+  if (t === 'element') return 'element';
+  if (t === 'column' || t === 'columnheader') return 'column';
+  if (t === 'logo' || t === 'image' || t === 'img' || t === 'icon') return 'img';
+  if (t === 'dialog' || t === 'modal') return 'dialog';
+  if (t === 'heading' || t === 'header') return 'heading';
+  if (t === 'title' || t === 'caption' || t === 'message') return 'text';
+  // Default based on action (matches scaffold generator)
+  switch (action) {
+    case 'click': return 'text';
+    case 'fill': return 'field';
+    case 'see': return 'text';
+    case 'select': return 'dropdown';
+    default: return 'element';
+  }
 }
 
 function escapeRegex(str: string): string {

package/src/core/live-scanner/types.ts

@@ -53,4 +53,5 @@ export interface LiveScanOptions {
   screensDir: string;
   headed?: boolean;
   authDir?: string;
+  force?: boolean;
 }

package/src/core/validator/selector-validator.ts

@@ -8,10 +8,11 @@ import * as path from 'path';
 import yaml from 'yaml';
 import { ValidationIssue } from './index';
 import { SelectorResolver } from '../../generators/test-generator/utils/selector-resolver';
+import { VALID_SELECTOR_TYPES, SelectorType } from '../../utils/selector-types';
 
 interface SelectorEntry {
   selector?: string;
-  type?: 'placeholder' | 'role' | 'testid' | 'label' | 'text' | 'page';
+  type?: SelectorType;
   value?: string;
   name?: string;
   nth?: number;
@@ -19,7 +20,7 @@ interface SelectorEntry {
 
 type SelectorFile = Record<string, SelectorEntry>;
 
-const VALID_TYPES = ['placeholder', 'role', 'testid', 'label', 'text', 'page'];
+const VALID_TYPES = VALID_SELECTOR_TYPES;
 
 export class SelectorValidator {
   private screenName: string;

package/src/generators/scaffold-generator/index.ts

@@ -8,10 +8,11 @@ import path from 'path';
 import yaml from 'yaml';
 import { glob } from 'glob';
 import { SelectorResolver } from '../test-generator/utils/selector-resolver';
+import { SelectorType } from '../../utils/selector-types';
 
 export interface ScaffoldElement {
   locator: string;
-  type: 'placeholder' | 'role' | 'text' | 'label' | 'page' | 'testid';
+  type: SelectorType;
   value: string;
   name?: string;       // For role type (accessible name), or label text
   nth: number;
@@ -176,6 +177,9 @@ export class ScaffoldGenerator {
     if (/^element\b/.test(lowerText) || /^\d*\s*element\b/.test(lowerText)) {
       return 'element';
     }
+    if (/^(column|columnheader)\b/.test(lowerText) || /^\d*\s*(column|columnheader)\b/.test(lowerText)) {
+      return 'column';
+    }
     if (/^(logo|image|img|icon)\b/.test(lowerText) || /^\d*\s*(logo|image|img|icon)\b/.test(lowerText)) {
       return 'img';
     }
@@ -395,9 +399,19 @@ export class ScaffoldGenerator {
         };
 
       case 'see':
+        // Column type: used for table column cell assertions, no DOM selector needed
+        if (targetType === 'column') {
+          return {
+            locator: '',
+            type: 'column',
+            value: element.rawText,
+            nth,
+          };
+        }
+
         // For assertions - respect targetType for role-based elements
         if (targetType === 'img' || targetType === 'button' || targetType === 'link' ||
-            targetType === 'checkbox' || targetType === 'radio' || targetType === 'heading' || targetType === 'dialog') {
+            targetType === 'checkbox' || targetType === 'radio' || targetType === 'heading' || targetType === 'dialog' || targetType === 'dropdown') {
           const seeRoleValue = this.getRoleValue(targetType);
           return {
             locator: '',
@@ -469,6 +483,8 @@ export class ScaffoldGenerator {
         return 'heading';
       case 'dialog':
         return 'dialog';
+      case 'dropdown':
+        return 'button';
       default:
         return 'button'; // Default to button
     }
@@ -643,6 +659,11 @@ export class ScaffoldGenerator {
       const enriched: ScaffoldResult = { ...scaffold };
 
       for (const [key, scaffoldElement] of Object.entries(enriched)) {
+        // Column-type elements use header text matching, skip live-scan enrichment
+        if (scaffoldElement.type === 'column') continue;
+        // Target elements (empty value) are matched by data value at runtime, skip enrichment
+        if (!scaffoldElement.value && !scaffoldElement.name) continue;
+
         // Try exact key first, then base key without --N suffix or --type suffix
         let liveElement = elements[key];
         if (!liveElement && key.includes('--')) {

package/src/generators/test-generator/adapters/playwright/templates/steps/actions/click-select-action.hbs

@@ -0,0 +1,2 @@
+await {{> locator}}.click();
+await page.getByText('{{selectValue}}', { exact: true }).first().click();

package/src/generators/test-generator/adapters/playwright/templates/steps/actions/wait-for-role-with-data.hbs

@@ -0,0 +1 @@
+await page.getByRole('{{role}}').filter({ hasText: '{{escapeQuotes dataValue}}' }).waitFor({ state: '{{state}}' });

package/src/generators/test-generator/adapters/playwright/templates/steps/actions/wait-for-role.hbs

@@ -0,0 +1 @@
+await page.getByRole('{{role}}').waitFor({ state: '{{state}}' });

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/checked-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeChecked();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeChecked();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/column-cell-assertion.hbs

@@ -0,0 +1,3 @@
+await page.waitForLoadState('networkidle');
+const {{columnIndexVar}} = (await page.getByRole('columnheader').allTextContents()).findIndex(h => h.includes('{{columnName}}'));
+await expect(page.getByRole('row').nth({{rowNth}}).getByRole('cell').nth({{columnIndexVar}})).toHaveText('{{dataValue}}');

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/contain-text-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toContainText('{{expectedText}}');
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toContainText('{{expectedText}}');

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/count-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toHaveCount({{expectedCount}});
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toHaveCount({{expectedCount}});

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/disabled-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeDisabled();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeDisabled();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/disabled-with-filter-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeDisabled();
+await page.waitForLoadState('networkidle');
+await expect({{> locator-base}}.filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{> locator-nth}}).toBeDisabled();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/disabled-with-role-variable-assertion.hbs

@@ -1,5 +1,6 @@
+await page.waitForLoadState('networkidle');
 {{#if name}}
-await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
+await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
 {{else}}
-await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
-{{/if}}
+await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
+{{/if}}

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/disabled-with-variable-assertion.hbs

@@ -1 +1,2 @@
-await expect(page.getByText('{{escapeQuotes selectorRef}}').filter({ hasText: {{#if (eq selectorValue "")}}/.*{{escapeRegex dataValue}}$/{{else}}'{{escapeQuotes dataValue}}'{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();
+await page.waitForLoadState('networkidle');
+await expect(page.getByText('{{escapeQuotes selectorRef}}').filter({ hasText: {{#if (eq selectorValue "")}}/.*{{escapeRegex dataValue}}$/{{else}}'{{escapeQuotes dataValue}}'{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeDisabled();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/empty-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeEmpty();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeEmpty();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/enabled-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeEnabled();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeEnabled();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/focused-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeFocused();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeFocused();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/have-text-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toHaveText('{{expectedText}}');
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toHaveText('{{expectedText}}');

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/hidden-dialog-heading-assertion.hbs

@@ -0,0 +1,2 @@
+await page.waitForLoadState('networkidle');
+await expect(page.getByRole('dialog').getByRole('heading', { name: '{{escapeQuotes dataValue}}' })).toBeHidden();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/hidden-with-filter-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeHidden();
+await page.waitForLoadState('networkidle');
+await expect({{> locator-base}}.filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{> locator-nth}}).toBeHidden();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/hidden-with-role-variable-assertion.hbs

@@ -1,5 +1,6 @@
+await page.waitForLoadState('networkidle');
 {{#if name}}
-await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
+await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
 {{else}}
-await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
-{{/if}}
+await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
+{{/if}}

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/hidden-with-variable-assertion.hbs

@@ -1 +1,2 @@
-await expect(page.getByText('{{escapeQuotes selectorRef}}').filter({ hasText: {{#if (eq selectorValue "")}}/.*{{escapeRegex dataValue}}$/{{else}}'{{escapeQuotes dataValue}}'{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();
+await page.waitForLoadState('networkidle');
+await expect(page.getByText('{{escapeQuotes selectorRef}}').filter({ hasText: {{#if (eq selectorValue "")}}/.*{{escapeRegex dataValue}}$/{{else}}'{{escapeQuotes dataValue}}'{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeHidden();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/is-hidden-assertion.hbs

@@ -1 +1,2 @@
+await page.waitForLoadState('networkidle');
 await expect({{> locator}}).toBeHidden();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/list-item-count-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}.getByRole('listitem')).toHaveCount({{expectedCount}});
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}.getByRole('listitem')).toHaveCount({{expectedCount}});

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/not-checked-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeChecked({ checked: false });
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeChecked({ checked: false });

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/page-assertion.hbs

@@ -1 +1,2 @@
+await page.waitForLoadState('networkidle');
 await expect(page).toHaveURL(/{{pathRegex}}/);

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/visible-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator}}).toBeVisible();
+await page.waitForLoadState('networkidle');
+await expect({{> locator}}).toBeVisible();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/visible-dialog-heading-assertion.hbs

@@ -0,0 +1,2 @@
+await page.waitForLoadState('networkidle');
+await expect(page.getByRole('dialog').getByRole('heading', { name: '{{escapeQuotes dataValue}}' })).toBeVisible();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/visible-with-locator-variable-assertion.hbs

@@ -1 +1,2 @@
-await expect({{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}).toBeVisible();
+await page.waitForLoadState('networkidle');
+await expect({{> locator-base}}.filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{> locator-nth}}).toBeVisible();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/visible-with-role-variable-assertion.hbs

@@ -1,9 +1,10 @@
+await page.waitForLoadState('networkidle');
 {{#if name}}
 {{#if dataValue}}
-await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
+await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
 {{else}}
 await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
 {{/if}}
 {{else}}
-await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: '{{escapeQuotes dataValue}}' }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
-{{/if}}
+await expect(page.getByRole('{{role}}'{{#if exact}}, { exact: true }{{/if}}).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();
+{{/if}}

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/visible-with-value-assertion.hbs

@@ -1 +1,2 @@
-await expect(page.getByText('{{escapeQuotes value}}').filter({ hasText: '{{escapeQuotes dataValue}}' })).toBeVisible();
+await page.waitForLoadState('networkidle');
+await expect(page.getByText('{{escapeQuotes value}}').filter({ hasText: /^{{escapeRegex dataValue}}$/ })).toBeVisible();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/visible-with-variable-assertion.hbs

@@ -1 +1,2 @@
+await page.waitForLoadState('networkidle');
 await expect(page.getByText('{{escapeQuotes selectorValue}}').filter({ hasText: /.*{{escapeRegex dataValue}}$/ }){{#if (gt nth 0)}}.nth({{subtract nth 1}}){{/if}}).toBeVisible();

package/src/generators/test-generator/adapters/playwright/templates/steps/navigation/navigation.hbs

@@ -1 +1 @@
-await page.goto('{{#if baseURL}}{{baseURL}}{{/if}}{{path}}');
+await page.goto('{{#if baseURL}}{{baseURL}}{{/if}}{{path}}', { waitUntil: 'networkidle' });

package/src/generators/test-generator/adapters/playwright/templates/steps/navigation/wait-for-element-with-text.hbs

@@ -1 +1 @@
-await {{> locator-base}}.filter({ hasText: '{{escapeQuotes dataValue}}' }){{> locator-nth}}.waitFor({ state: '{{state}}' });
+await {{> locator-base}}.filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{> locator-nth}}.waitFor({ state: '{{state}}' });