Skip to content

Commit 0a76f7a

Browse files
committed
Resolve Charlie governance closeout merge conflict
2 parents 8ef8874 + 592f217 commit 0a76f7a

9 files changed

Lines changed: 62 additions & 11 deletions
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# PR_26175_ALFA_051-idea-board-game-hub-row-expectation Manual Validation Notes
2+
3+
- Confirmed the stale three-row expectation was limited to the Idea Board cross-flow test path.
4+
- Confirmed the updated test now passes against current Game Hub rendering.
5+
- No manual UI change was required because this PR only updates the test expectation.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# PR_26175_ALFA_051-idea-board-game-hub-row-expectation Report
2+
3+
## Summary
4+
- Updated the Idea Board cross-flow Game Hub assertions to match the current expanded-row contract.
5+
- The flow now expects the two current child rows: source-idea and readiness-output.
6+
- Removed the stale expectation for a Game Summary child row from this Idea Board test path.
7+
8+
## Branch Validation
9+
PASS
10+
11+
## Scope
12+
- Test expectation only.
13+
- No runtime code changes.
14+
- No UI changes.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# PR_26175_ALFA_051-idea-board-game-hub-row-expectation Requirements Checklist
2+
3+
- PASS: Align Idea Board Game Hub expanded-row expectation with current Game Hub behavior.
4+
- PASS: Preserve Source Idea child-table assertions.
5+
- PASS: Preserve Readiness Output child-table assertion.
6+
- PASS: Avoid runtime code changes.
7+
- PASS: Avoid UI changes.
8+
- PASS: Produce repo-structured delta ZIP under tmp/.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# PR_26175_ALFA_051-idea-board-game-hub-row-expectation Validation Lane
2+
3+
## Commands
4+
- PASS: node --check tests/playwright/tools/IdeaBoardTableNotes.spec.mjs
5+
- PASS: npx playwright test tests/playwright/tools/IdeaBoardTableNotes.spec.mjs --workers=1 (4 passed)
6+
7+
## Branch Validation
8+
PASS

docs_build/dev/reports/PR_26175_CHARLIE_026-charlie-governance-gap-closeout-requirement-checklist.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
- PASS: Update backlog/roadmap only as needed.
1313
- PASS: Create required reports.
1414
- PASS: Create repo-structured ZIP under `tmp/`.
15-
- PENDING: Push branch.
16-
- PENDING: Open draft PR.
15+
- PASS: Push branch.
16+
- PASS: Open draft PR.
1717
- PASS: Do not merge.

docs_build/dev/reports/PR_26175_CHARLIE_026-charlie-governance-gap-closeout-validation.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ git diff --check
88

99
Result: PASS
1010

11+
```text
12+
git merge-tree $(git merge-base origin/main HEAD) origin/main HEAD
13+
```
14+
15+
Result: initial mergeability probe identified conflicts only in generated Codex report artifacts.
16+
17+
```text
18+
git merge origin/main
19+
```
20+
21+
Result: conflicts resolved by regenerating `codex_changed_files.txt` and `codex_review.diff`.
22+
1123
```text
1224
git diff --name-only
1325
```

docs_build/dev/reports/PR_26175_CHARLIE_026-charlie-governance-gap-closeout.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ Closed the remaining Team Charlie governance gap identified by the workstream au
3131
- PASS: cancelled/not-doing language is present in backlog and roadmap
3232
- PASS: runtime files unchanged
3333

34+
## Mergeability Review
35+
36+
- GitHub reported `mergeable=false` after `origin/main` advanced beyond the PR base.
37+
- Local merge probe confirmed the only conflicts were shared generated report artifacts: `docs_build/dev/reports/codex_changed_files.txt` and `docs_build/dev/reports/codex_review.diff`.
38+
- Resolved by merging latest `origin/main` into the PR branch and regenerating the Charlie report artifacts from the final diff.
39+
3440
## ZIP Artifact
3541

3642
- `tmp/PR_26175_CHARLIE_026-charlie-governance-gap-closeout_delta.zip`
1.49 KB
Binary file not shown.

tests/playwright/tools/IdeaBoardTableNotes.spec.mjs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -416,12 +416,10 @@ test("Idea Board uses accordion table ideas and notes", async ({ page }) => {
416416
await expect(activeGameToggle).toHaveText("Lantern Reef");
417417
await activeGameToggle.click();
418418
let expandedRows = page.locator("[data-game-expanded-row]");
419-
await expect(expandedRows).toHaveCount(3);
420-
await expect(expandedRows.nth(0)).toHaveAttribute("data-game-child-row", "summary");
421-
await expect(expandedRows.nth(1)).toHaveAttribute("data-game-child-row", "source-idea");
422-
await expect(expandedRows.nth(2)).toHaveAttribute("data-game-child-row", "readiness-output");
423-
await expect(expandedRows.nth(0).locator("[data-game-child-table='summary'] caption")).toHaveText("Game Summary");
424-
let sourceIdeaChildTable = expandedRows.nth(1).locator("[data-game-child-table='source-idea']");
419+
await expect(expandedRows).toHaveCount(2);
420+
await expect(expandedRows.nth(0)).toHaveAttribute("data-game-child-row", "source-idea");
421+
await expect(expandedRows.nth(1)).toHaveAttribute("data-game-child-row", "readiness-output");
422+
let sourceIdeaChildTable = expandedRows.nth(0).locator("[data-game-child-table='source-idea']");
425423
await expect(sourceIdeaChildTable.locator("caption")).toHaveText("Source Idea");
426424
await expect(sourceIdeaChildTable.locator("thead th")).toHaveText(["Context", "Details"]);
427425
await expect(sourceIdeaChildTable.locator("tbody tr")).toHaveText([
@@ -430,7 +428,7 @@ test("Idea Board uses accordion table ideas and notes", async ({ page }) => {
430428
"Note 1Use dusk tide changes as the first Game Hub planning note.",
431429
]);
432430
await expect(sourceIdeaChildTable.locator(":is(input, textarea, select, button)")).toHaveCount(0);
433-
await expect(expandedRows.nth(2).locator("[data-game-child-table='readiness-output'] caption")).toHaveText("Readiness Output");
431+
await expect(expandedRows.nth(1).locator("[data-game-child-table='readiness-output'] caption")).toHaveText("Readiness Output");
434432
await page.reload({ waitUntil: "networkidle" });
435433
await expect(page.locator("[data-active-game-name]")).toHaveCount(0);
436434
await expect(page.locator("[data-game-list]")).toContainText("Lantern Reef");
@@ -439,8 +437,8 @@ test("Idea Board uses accordion table ideas and notes", async ({ page }) => {
439437
await expect(page.locator("[data-game-hub-foundation]")).toHaveCount(0);
440438
await activeGameToggle.click();
441439
expandedRows = page.locator("[data-game-expanded-row]");
442-
await expect(expandedRows).toHaveCount(3);
443-
sourceIdeaChildTable = expandedRows.nth(1).locator("[data-game-child-table='source-idea']");
440+
await expect(expandedRows).toHaveCount(2);
441+
sourceIdeaChildTable = expandedRows.nth(0).locator("[data-game-child-table='source-idea']");
444442
await expect(sourceIdeaChildTable.locator("tbody tr")).toHaveText([
445443
"IdeaLantern Reef",
446444
"PitchGuide light through a reef that rearranges at dusk.",

0 commit comments

Comments
 (0)