Skip to content

Commit 2442e44

Browse files
committed
chore: merge develop, address PR review comments
- Resolve merge conflict in prompt-box-files.html (merge rendering + a11y changes) - Remove tracked JSON report files (aria-validation-report.json, wcag-compliance-report.json) - Fix .gitignore: only ignore JSON reports in tests/_output/, not the whole directory - Simplify CI: remove unused affected-only input from _test-a11y-specs.yml - Simplify CI: remove infoResults from set-commit-status (ci-a11y-specs reports its own status)
2 parents f95856b + 67afeef commit 2442e44

File tree

7 files changed

+21
-8427
lines changed

7 files changed

+21
-8427
lines changed

.github/workflows/_test-a11y-specs.yml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ name: Test A11y Specs
22

33
on:
44
workflow_call:
5-
inputs:
6-
affected-only:
7-
required: false
8-
type: boolean
9-
default: true
105

116
concurrency:
127
group: test-a11y-specs-${{ github.ref }}
@@ -56,37 +51,25 @@ jobs:
5651
- name: Build HTML package
5752
run: npm run build --prefix packages/html
5853

59-
- name: Run unified A11y tests (affected only)
54+
- name: Run unified A11y tests (affected components)
6055
id: a11y-tests
61-
if: ${{ inputs.affected-only }}
6256
continue-on-error: true
6357
run: |
6458
xvfb-run --auto-servernum --server-args="-screen 0, 1366x768x24" npm run test:a11y:unified -- --affected --verbose 2>&1 | tee a11y-test-output.txt
6559
66-
- name: Run unified A11y tests (all components)
67-
id: a11y-tests-all
68-
if: ${{ !inputs.affected-only }}
69-
continue-on-error: true
70-
run: |
71-
xvfb-run --auto-servernum --server-args="-screen 0, 1366x768x24" npm run test:a11y:unified -- --verbose 2>&1 | tee a11y-test-output.txt
72-
7360
- name: Report test results
7461
run: |
7562
echo "## A11y Spec Test Results" >> $GITHUB_STEP_SUMMARY
7663
echo "" >> $GITHUB_STEP_SUMMARY
7764
78-
OUTCOME="${{ steps.a11y-tests.outcome || steps.a11y-tests-all.outcome }}"
79-
80-
if [ "$OUTCOME" == "success" ]; then
65+
if [ "${{ steps.a11y-tests.outcome }}" == "success" ]; then
8166
echo ":white_check_mark: Unified A11y tests passed (ARIA + WCAG)" >> $GITHUB_STEP_SUMMARY
8267
else
8368
echo ":x: A11y tests failed" >> $GITHUB_STEP_SUMMARY
8469
fi
8570
86-
if [ "${{ inputs.affected-only }}" == "true" ]; then
87-
echo "" >> $GITHUB_STEP_SUMMARY
88-
echo "_Tested affected components only for faster CI._" >> $GITHUB_STEP_SUMMARY
89-
fi
71+
echo "" >> $GITHUB_STEP_SUMMARY
72+
echo "_Tested affected components only for faster CI._" >> $GITHUB_STEP_SUMMARY
9073
9174
echo "" >> $GITHUB_STEP_SUMMARY
9275
echo "### Test Output" >> $GITHUB_STEP_SUMMARY
@@ -100,8 +83,7 @@ jobs:
10083
10184
- name: Check for failures
10285
run: |
103-
OUTCOME="${{ steps.a11y-tests.outcome || steps.a11y-tests-all.outcome }}"
104-
if [ "$OUTCOME" == "failure" ]; then
86+
if [ "${{ steps.a11y-tests.outcome }}" == "failure" ]; then
10587
echo "A11y spec tests failed. See summary above for details."
10688
exit 1
10789
fi

.github/workflows/ci.yml

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
set-commit-status:
9898
name: Set commit status
9999
runs-on: ubuntu-latest
100-
needs: [ detect-changes, ci-lint-scripts, ci-lint-styles, ci-docs, ci-test-units, ci-test-integrations, ci-a11y, ci-a11y-specs, ci-test-html-spec ]
100+
needs: [ detect-changes, ci-lint-scripts, ci-lint-styles, ci-docs, ci-test-units, ci-test-integrations, ci-a11y, ci-test-html-spec ]
101101
timeout-minutes: 30
102102
if: ${{ always() && needs.detect-changes.outputs.snapshot_sha }}
103103

@@ -121,12 +121,6 @@ jobs:
121121
['success', 'Status check > Visual']
122122
];
123123
124-
// Non-blocking checks - reported with actual status but don't prevent merging
125-
// (configure as non-required in GitHub repo settings)
126-
const infoResults = [
127-
['${{ needs.ci-a11y-specs.result }}', 'Status check > A11y Specs (non-blocking)']
128-
];
129-
130124
const mapState = (r) => {
131125
if (r === 'success') return 'success';
132126
if (r === 'cancelled' || r === 'skipped') return 'failure';
@@ -136,30 +130,17 @@ jobs:
136130
const sha = '${{ needs.detect-changes.outputs.snapshot_sha }}';
137131
const targetUrl = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
138132
139-
await Promise.all([
140-
...results.map(([result, contextName]) =>
141-
github.rest.repos.createCommitStatus({
142-
owner: context.repo.owner,
143-
repo: context.repo.repo,
144-
sha,
145-
context: contextName,
146-
state: mapState(result),
147-
target_url: targetUrl,
148-
description: 'Automated visual snapshot commit'
149-
})
150-
),
151-
...infoResults.map(([result, contextName]) =>
152-
github.rest.repos.createCommitStatus({
153-
owner: context.repo.owner,
154-
repo: context.repo.repo,
155-
sha,
156-
context: contextName,
157-
state: mapState(result),
158-
target_url: targetUrl,
159-
description: result === 'success' ? 'All a11y spec tests passed' : 'A11y spec tests failed (non-blocking)'
160-
})
161-
)
162-
]);
133+
await Promise.all(results.map(([result, contextName]) =>
134+
github.rest.repos.createCommitStatus({
135+
owner: context.repo.owner,
136+
repo: context.repo.repo,
137+
sha,
138+
context: contextName,
139+
state: mapState(result),
140+
target_url: targetUrl,
141+
description: 'Automated visual snapshot commit'
142+
})
143+
));
163144
164145
ci-visual:
165146
name: Status check > Visual

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ debug.log
2121
.nx/cache
2222
.nx/workspace-data
2323

24-
# Generated test output
25-
tests/_output/
24+
# Generated a11y test reports (not tracked; screenshots in tests/_output/ ARE tracked)
25+
tests/_output/*.json

packages/html/src/prompt-box/tests/prompt-box-files.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default () =>(
1919
<PromptBoxLineModeMulti
2020
placeholder="Type a message"
2121
endAffix={<>
22-
<IconButton icon="paperclip-outline-alt-right" size="small" fillMode="flat" />
22+
<IconButton icon="paperclip-outline-alt-right" size="small" fillMode="flat" rounded="full" />
2323
<div className="k-spacer"></div>
2424
</>}
2525
/>

0 commit comments

Comments
 (0)