@sun-asterisk/sungen 2.1.0 → 2.2.0

package/dist/orchestrator/templates/readme.md

@@ -17,11 +17,17 @@ sungen generate → compiles Gherkin + selectors + data → Playwright .spec.ts
 │   ├── selectors/        # Element locator YAML mappings
 │   └── test-data/        # Test data YAML values
 ├── specs/
-│   ├── generated/        # Auto-generated Playwright tests
-│   └── .auth/            # Auth storage states
+│   └── generated/        # Auto-generated Playwright tests
+├── .claude/
+│   ├── commands/sungen/  # Claude Code slash commands
+│   └── skills/           # Claude Code auto-loaded skills
 ├── .github/
-│   └── copilot-instructions.md  # AI rules for GitHub Copilot
-└── CLAUDE.md                    # AI rules for Claude Code
+│   ├── copilot-instructions.md   # AI rules for GitHub Copilot
+│   └── prompts/                  # Copilot slash commands
+├── .vscode/
+│   └── settings.json     # Copilot auto-attach settings
+├── CLAUDE.md             # AI rules for Claude Code
+└── playwright.config.ts  # Playwright config (timeout: 10s, workers: 2)
 ```
 
 ## Workflow
@@ -32,45 +38,50 @@ Step 1                Step 2                Step 3
 │ /add-    │────────▶│ /make-tc │────────▶│ /make-   │
 │ screen   │         │          │         │ test     │
 └──────────┘         └──────────┘         └──────────┘
- Scaffold              Design TCs           Compile &
- directories           & generate           run tests
-                       3 files
+ Scaffold              Pick sections        Generate
+ directories           → design TCs         selectors
+                       → generate           → compile
+                       .feature +           → run tests
+                       test-data            → auto-fix
 ```
 
 Use AI commands (Claude Code or GitHub Copilot) to drive the workflow:
 
 ### Step 1: Add a screen
 
-| Claude Code | GitHub Copilot |
+| Claude Code | GitHub Copilot (VS Code) |
 |---|---|
-| `/sungen:add-screen login /login` | `@workspace /sungen-add-screen login /login` |
+| `/sungen:add-screen` | `/sungen-add-screen` |
 
 Scaffolds `qa/screens/<name>/` with empty feature, selectors, and test-data files, then asks if you want to create test cases.
 
 ### Step 2: Create test cases
 
-| Claude Code | GitHub Copilot |
+| Claude Code | GitHub Copilot (VS Code) |
 |---|---|
-| `/sungen:make-tc login` | `@workspace /sungen-make-tc login` |
+| `/sungen:make-tc login` | `/sungen-make-tc login` |
 
-AI acts as a **Senior QA Engineer**: explores the live page (via Playwright MCP) or analyzes static designs, gathers test viewpoints (UI/UX, Validation, Logic, Security), and generates the 3 files.
+AI acts as a **Senior QA Engineer**:
+1. Explores the live page via Playwright MCP (asks user to log in if auth needed)
+2. Identifies screen sections → asks user which to focus on
+3. Generates **20+ scenarios per viewpoint** (UI/UX, Validation, Logic, Security) for each section
+4. Confirms test plan before generating `.feature` + `test-data.yaml`
 
 ### Step 3: Compile & run tests
 
-| Claude Code | GitHub Copilot |
+| Claude Code | GitHub Copilot (VS Code) |
 |---|---|
-| `/sungen:make-test login` | `@workspace /sungen-make-test login` |
+| `/sungen:make-test login` | `/sungen-make-test login` |
 
-AI acts as a **Senior Developer**: compiles Gherkin → Playwright `.spec.ts`, runs tests, and auto-fixes selectors/test-data on failure (up to 5 attempts).
+AI acts as a **Senior Developer**:
+1. Navigates to live page, takes snapshot, verifies DOM properties
+2. Generates `selectors.yaml` from exact accessible names
+3. Compiles Gherkin → Playwright `.spec.ts`
+4. Runs tests, auto-fixes selectors on failure (up to 5 attempts)
 
-### Auth setup (if needed)
+### Auth setup
 
-If any page requires authentication, run manually before Step 2:
-
-```bash
-sungen makeauth admin --url <baseURL>
-# Opens browser → login manually → saves specs/.auth/admin.json
-```
+If any page requires authentication, the AI will ask you to **log in manually via the MCP browser** during Step 2 or Step 3. No separate auth command needed.
 
 ### Manual CLI commands
 
@@ -85,7 +96,24 @@ npx playwright test --ui                     # Interactive mode
 
 ---
 
-## Gherkin Guide
+## VS Code Copilot Setup
+
+Add to `.vscode/settings.json` to auto-load Gherkin syntax when editing `.feature` files:
+
+```json
+{
+  "github.copilot.chat.codeGeneration.instructions": [
+    {
+      "file": ".github/prompts/sungen-gherkin-syntax.prompt.md",
+      "applyTo": "**/*.feature"
+    }
+  ]
+}
+```
+
+---
+
+## Gherkin Quick Reference
 
 ### Syntax
 
@@ -97,101 +125,50 @@ User <action> [<Target>] <type> with {{<Value>}}
 - `{{Value}}` → test data reference → lookup in `test-data/*.yaml`
 - `<type>` → element type: button, link, field, heading, text, etc.
 
-### Pattern Shapes (17 total)
-
-#### Actions
-
-| Pattern | Example |
-|---|---|
-| Simple click | `User click [Submit] button` |
-| Click with data | `User click [Teammate] button with {{name}}` |
-| Fill field | `User fill [Email] field with {{email}}` |
-| Check/Uncheck | `User check [Remember me] checkbox` |
-| Select dropdown | `User select [Country] dropdown with {{country}}` |
-| Upload file | `User upload [Avatar] file with {{path}}` |
-| Double click | `User double click [Cell] element` |
-| Hover | `User hover [Info] icon` |
-| Clear | `User clear [Search] field` |
-
-#### Keyboard
-
-| Pattern | Example |
-|---|---|
-| Global key | `User press Escape key` |
-| Key on element | `User press Enter on [Search] field` |
-
-#### Navigation
-
-| Pattern | Example |
-|---|---|
-| Open page | `User is on [login] page` |
-| See page (URL) | `User see [dashboard] page` |
-
-#### Wait
-
-| Pattern | Example |
-|---|---|
-| Wait timeout | `User wait for 3 seconds` |
-| Wait element | `User wait for [Modal] dialog` |
-| Wait hidden | `User wait for [Loading] spinner is hidden` |
-| Wait with data | `User wait for [Dialog] dialog with {{title}}` |
-
-#### Assertions
-
-| Pattern | Example |
-|---|---|
-| See element | `User see [Welcome] heading` |
-| See with value | `User see [Title] heading with {{title}}` |
-| State check | `User see [Submit] button is disabled` |
-| State + data | `User see [Panel] dialog with {{title}} is hidden` |
-| Text contains | `User see [Message] text contains {{partial}}` |
-
-States: `hidden`, `visible`, `disabled`, `enabled`, `checked`, `unchecked`, `focused`, `empty`
-
-#### Table
+### Key Patterns
 
 | Pattern | Example |
 |---|---|
-| Row exists | `User see [Users] table has row with {{name}}` |
-| No row | `User see [Users] table has no row with {{name}}` |
-| Row count | `User see [Users] table has {{count}} rows` |
-| Column exists | `User see [Users] table has [Email] column` |
-| Cell by filter | `User see [Users] table row with {{name}} has [Status] with {{status}}` |
-| Cell by index | `User see [Users] table row 1 [Name] cell with {{name}}` |
-| Action in row | `User click [Edit] in [Users] table row with {{name}}` |
-| Empty table | `User see [Users] table is empty` |
-
-#### Scope
-
-| Pattern | Example |
-|---|---|
-| Scroll | `User scroll to [Footer] section` |
-| Frame enter | `User switch to [Payment] frame` |
-| Frame exit | `User switch to [main] frame` |
+| Navigate | `User is on [login] page` |
+| Click | `User click [Submit] button` |
+| Fill | `User fill [Email] field with {{email}}` |
+| Assert visible | `User see [Welcome] heading is visible` |
+| Assert text | `User see [Title] heading with {{title}}` |
+| Assert state | `User see [Submit] button is disabled` |
+| Wait for | `User wait for [Modal] dialog is visible` |
+| Table row | `User see [Users] table has row with {{name}}` |
+| Table column | `User see [Users] table has [Email] column` |
+
+States: `hidden` `visible` `disabled` `enabled` `checked` `unchecked` `focused` `empty` `loading` `selected`
 
 ### Tags
 
 | Tag | Purpose |
 |---|---|
 | `@auth:role` | Use Playwright storage state for auth |
+| `@no-auth` | Disable inherited auth for this scenario |
 | `@steps:name` | Define reusable step group |
 | `@extend:name` | Inherit steps from another scenario |
 | `@manual` | Skip scenario in generation |
 
-### Selector YAML
+### YAML Selector Keys
+
+Keys are **lowercase with spaces**, Unicode preserved:
+- `[Search Content]` → `search content:`
+- `[Thời gian]` → `thời gian:`
+- Same label, different types → `add campaign--button:` / `add campaign--text:`
+
+### Selector Types
 
 ```yaml
-submit.button:
-  type: 'role'              # testid, role, text, label, placeholder, locator, page
-  value: 'button'           # role name, testid value, CSS selector, etc.
-  name: 'Submit'            # accessible name
-  nth: 0                    # element index, 0-indexed (omit for strict mode)
-  exact: true               # exact name match (avoid "Submit" matching "Submit Form")
-  scope: 'desktop navigation'  # scope to parent landmark
-  match: 'exact'            # exact text match for getByText
+search:
+  type: 'placeholder'        # testid, role, placeholder, label, text, locator, page
+  value: 'Search users'      # placeholder text, role name, CSS selector, etc.
+  name: 'Search'             # accessible name (for role type)
+  nth: 0                     # element index (for multiple matches)
 ```
 
-Locator priority: `data-testid` > `role+name` > `label` > `text` > `CSS`
+Priority: `data-testid` > `role+name` > `placeholder` > `label` > `text` > `CSS locator`
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sun-asterisk/sungen",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Deterministic E2E Test Compiler - Gherkin + Selectors → Playwright tests",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/cli/index.ts

@@ -16,7 +16,7 @@ async function main() {
   program
     .name('sungen')
     .description('Deterministic E2E Test Compiler — Gherkin + Selectors → Playwright')
-    .version('2.1.0');
+    .version('2.2.0');
 
   // Global options
   program

package/src/generators/test-generator/adapters/adapter-interface.ts

@@ -3,13 +3,19 @@
  * Defines the contract for framework-specific test code generation
  */
 
+export interface AuthGroup {
+  authRole?: string;
+  scenarios: string[];
+}
+
 export interface TestFileData {
   imports: string;
   featureName: string;
   featureDescription?: string;
   background?: string;
   scenarios: string[];
-  authRole?: string; // Feature-level auth role (optional)
+  authGroups?: AuthGroup[]; // Grouped by auth role for nested describes
+  singleAuthRole?: string;  // Auth role when all scenarios share the same role
 }
 
 export interface ScenarioData {

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

@@ -1,7 +1,3 @@
-{{#if authRole}}
-  test.use({ storageState: 'specs/.auth/{{authRole}}.json' });
-
-{{/if}}
   test('{{scenarioName}}', async ({ page }) => {
 {{#each steps}}
 {{#if comment}}

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

@@ -0,0 +1 @@
+await {{> locator}}.dragTo({{targetLocator}});

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

@@ -0,0 +1,11 @@
+{{#if (eq direction 'expand')}}
+if (await {{> locator}}.getAttribute('aria-expanded') !== 'true') {
+  await {{> locator}}.click();
+}
+await expect({{> locator}}).toHaveAttribute('aria-expanded', 'true');
+{{else}}
+if (await {{> locator}}.getAttribute('aria-expanded') !== 'false') {
+  await {{> locator}}.click();
+}
+await expect({{> locator}}).toHaveAttribute('aria-expanded', 'false');
+{{/if}}

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

@@ -1 +1 @@
-await {{> locator}}.fill('{{fillValue}}');
+await {{> locator}}.fill('{{escapeQuotes fillValue}}');

package/src/generators/test-generator/adapters/playwright/templates/steps/actions/fill-editor-action.hbs

@@ -1,3 +1,3 @@
 const editorLocator = {{> locator}};
 await editorLocator.click();
-await editorLocator.pressSequentially('{{fillValue}}');
+await editorLocator.pressSequentially('{{escapeQuotes fillValue}}');

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

@@ -0,0 +1 @@
+await {{> locator}}.click();

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

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

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

@@ -1,3 +1,2 @@
-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,2 +1 @@
-await page.waitForLoadState('networkidle');
 await expect({{> locator}}).toContainText('{{expectedText}}');

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

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

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

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

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

@@ -1,2 +1 @@
-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,4 +1,3 @@
-await page.waitForLoadState('networkidle');
 {{#if name}}
 await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gte nth 0)}}.nth({{nth}}){{/if}}).toBeDisabled();
 {{else}}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,2 +1 @@
-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,2 +1 @@
-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,4 +1,3 @@
-await page.waitForLoadState('networkidle');
 {{#if name}}
 await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gte nth 0)}}.nth({{nth}}){{/if}}).toBeHidden();
 {{else}}

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

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

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

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

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

@@ -1,2 +1 @@
-await page.waitForLoadState('networkidle');
 await expect(page.getByText(/{{#if label}}{{escapeRegex label}}\s*{{else}}(?:^|\s){{/if}}{{escapeRegex dataValue}}$/)).toBeVisible();

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

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

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

@@ -0,0 +1 @@
+await expect({{> locator}}).toHaveAttribute('aria-busy', 'true');

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

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

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

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

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

@@ -0,0 +1 @@
+await expect({{> locator}}).toHaveAttribute('aria-selected', 'true');

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

@@ -0,0 +1 @@
+await expect({{> locator}}).toHaveAttribute('aria-sort', '{{sortDirection}}');

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/table-cell-by-filter.hbs

@@ -1,3 +1,2 @@
-await page.waitForLoadState('networkidle');
 { const tableRow = {{> locator}}.getByRole('row').filter({ hasText: '{{escapeQuotes filterValue}}' });
 await expect(tableRow.getByRole('cell').filter({ hasText: '{{escapeQuotes cellValue}}' })).toBeVisible(); }

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/table-cell-by-index.hbs

@@ -1,3 +1,2 @@
-await page.waitForLoadState('networkidle');
 { const tableRow = {{> locator}}.getByRole('row').nth({{rowIndex}});
 await expect(tableRow.getByRole('cell').filter({ hasText: '{{escapeQuotes cellValue}}' })).toBeVisible(); }

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/table-column-exists.hbs

@@ -1,2 +1 @@
-await page.waitForLoadState('networkidle');
 await expect({{> locator}}.getByRole('columnheader', { name: '{{escapeQuotes columnName}}' })).toBeVisible();

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

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

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

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

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/table-row-exists.hbs

@@ -1,2 +1 @@
-await page.waitForLoadState('networkidle');
 await expect({{> locator}}.getByRole('row').filter({ hasText: '{{escapeQuotes filterValue}}' })).toBeVisible();

package/src/generators/test-generator/adapters/playwright/templates/steps/assertions/table-row-not-exists.hbs

@@ -1,2 +1 @@
-await page.waitForLoadState('networkidle');
 await expect({{> locator}}.getByRole('row').filter({ hasText: '{{escapeQuotes filterValue}}' })).toHaveCount(0);

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

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

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

@@ -1,2 +1 @@
-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,2 +1 @@
-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,4 +1,3 @@
-await page.waitForLoadState('networkidle');
 {{#if name}}
 {{#if dataValue}}
 await expect(page.getByRole('{{role}}', { name: '{{escapeQuotes name}}'{{#if exact}}, exact: true{{/if}} }).filter({ hasText: /^{{escapeRegex dataValue}}$/ }){{#if (gte nth 0)}}.nth({{nth}}){{/if}}).toBeVisible();

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

@@ -1,2 +1 @@
-await page.waitForLoadState('networkidle');
 await expect(page.getByText('{{escapeQuotes value}}'{{#if exact}}, { exact: true }{{/if}}){{#if (gte nth 0)}}.nth({{nth}}){{/if}}).toBeVisible();

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

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

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

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

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

@@ -8,12 +8,37 @@
 {{/if}}
 
 test.describe('{{featureName}}', () => {
+{{#if singleAuthRole}}
+  test.use({ storageState: 'specs/.auth/{{singleAuthRole}}.json' });
+
+{{/if}}
 {{#if background}}
 {{background}}
 
 {{/if}}
+{{#if authGroups}}
+{{#each authGroups}}
+{{#if authRole}}
+  test.describe('{{authRole}}', () => {
+    test.use({ storageState: 'specs/.auth/{{authRole}}.json' });
+
+{{#each scenarios}}
+{{indent this 2}}
+
+{{/each}}
+  });
+
+{{else}}
+{{#each scenarios}}
+{{this}}
+
+{{/each}}
+{{/if}}
+{{/each}}
+{{else}}
 {{#each scenarios}}
 {{this}}
 
 {{/each}}
+{{/if}}
 });

package/src/generators/test-generator/code-generator.ts

@@ -229,7 +229,8 @@ export class CodeGenerator {
 
     // Generate all scenarios with feature tags for inheritance
     // Skip scenarios tagged with @manual
-    const scenarios: string[] = [];
+    // Track auth role per scenario for grouping
+    const renderedScenarios: Array<{ code: string; authRole?: string }> = [];
     for (const scenario of feature.scenarios) {
       if (isManual(scenario.tags)) {
         if (this.options.verbose) {
@@ -237,22 +238,63 @@ export class CodeGenerator {
         }
         continue;
       }
-      scenarios.push(
-        await this.generateScenario(
-          scenario,
-          !!feature.background,
-          feature.tags || []
-        )
+
+      // Resolve auth tags for @extend scenarios (same logic as generateScenario)
+      let authFeatureTags = feature.tags || [];
+      if (scenario.extendsName) {
+        const baseScenario = this.stepsRegistry.get(scenario.extendsName);
+        if (baseScenario) {
+          authFeatureTags = [...baseScenario.tags, ...authFeatureTags];
+        }
+      }
+      const authRole = getEffectiveAuthRole(scenario.tags, authFeatureTags);
+
+      const code = await this.generateScenario(
+        scenario,
+        !!feature.background,
+        feature.tags || []
       );
+      renderedScenarios.push({ code, authRole });
     }
 
+    // Group scenarios by auth role for nested test.describe blocks
+    // This ensures test.use({ storageState }) only applies to its group
+    const authGroupMap = new Map<string, string[]>();
+    const groupOrder: string[] = [];
+    for (const { code, authRole } of renderedScenarios) {
+      const key = authRole || '';
+      if (!authGroupMap.has(key)) {
+        authGroupMap.set(key, []);
+        groupOrder.push(key);
+      }
+      authGroupMap.get(key)!.push(code);
+    }
+
+    const authGroups = groupOrder.map(key => ({
+      authRole: key || undefined,
+      scenarios: authGroupMap.get(key)!,
+    }));
+
+    // Determine rendering strategy:
+    // - Single group: flat structure (test.use at describe level if auth)
+    // - Multiple groups: nested describes per auth role
+    const needsGrouping = authGroups.length > 1;
+    const scenarios = renderedScenarios.map(s => s.code);
+
+    // For single group, extract the auth role to put test.use at describe level
+    const singleAuthRole = !needsGrouping && authGroups.length === 1
+      ? authGroups[0].authRole
+      : undefined;
+
     // Use adapter to render the complete test file structure
     return this.adapter.renderTestFile({
       imports: '', // Not used in template as it's rendered separately
       featureName: feature.name,
       featureDescription: feature.description,
       background,
-      scenarios,
+      scenarios: needsGrouping ? [] : scenarios,
+      authGroups: needsGrouping ? authGroups : undefined,
+      singleAuthRole,
     });
   }