Skip to content

Commit

Permalink
Merge branch 'development' into additional-raise-issue-links
Browse files Browse the repository at this point in the history
  • Loading branch information
howard-e committed Dec 5, 2024
2 parents 196732b + 0fe3946 commit 939c33d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 9 deletions.
4 changes: 2 additions & 2 deletions client/components/TestRun/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ const TestRun = () => {
setCurrentBrowserVersion(currentBrowserVersion);
// Testers do not need to change AT/Browser versions
// while assigning verdicts for previously automated tests
if (testPlanRun?.initiatedByAutomation) {
if (!isSignedIn || tester?.isBot) {
setIsShowingAtBrowserModal(false);
}
setPageReady(true);
Expand Down Expand Up @@ -1147,7 +1147,7 @@ const TestRun = () => {
browser={`${testPlanReport.browser?.name}${
isViewingRun ? ` ${currentBrowserVersion?.name || ''}` : ''
}`}
showEditAtBrowser={isViewingRun && !testPlanRun.initiatedByAutomation}
showEditAtBrowser={isSignedIn && isViewingRun && !openAsUser?.isBot}
openAsUser={openAsUser}
testResults={testResults}
testCount={testCount}
Expand Down
2 changes: 1 addition & 1 deletion client/tests/e2e/TestRun.e2e.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ describe('Test Run when signed in as tester', () => {
testPlanSectionButtonSelector:
'button#disclosure-btn-horizontal-slider-0',
testPlanTableSelector:
'table[aria-label="Reports for Color Viewer Slider V24.06.26 in draft phase"]'
'table[aria-label="Reports for Color Viewer Slider V24.12.04 in draft phase"]'
});
await handlePageSubmit(page, { expectConflicts: false });
}
Expand Down
6 changes: 3 additions & 3 deletions client/tests/e2e/snapshots/saved/_data-management.html
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ <h2>Test Plans Status Summary</h2>
<path
fill="currentColor"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
><b>V24.06.26</b></span
><b>V24.12.04</b></span
></a
></span
><span role="listitem"
Expand Down Expand Up @@ -2407,7 +2407,7 @@ <h2>Test Plans Status Summary</h2>
<td>
<div class="css-bpz90">
<span class="rd full-width css-be9e2a">R&amp;D</span>
<p class="review-text">Complete <b>Oct 22, 2024</b></p>
<p class="review-text">Complete <b>Dec 4, 2024</b></p>
</div>
</td>
<td>
Expand All @@ -2430,7 +2430,7 @@ <h2>Test Plans Status Summary</h2>
<path
fill="currentColor"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
><b>V24.10.22</b></span
><b>V24.12.04</b></span
></a
></span
><button
Expand Down
6 changes: 3 additions & 3 deletions client/tests/e2e/snapshots/saved/_test-queue.html
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ <h3>
<path
fill="currentColor"
d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"></path></svg
><b>V24.06.26</b></span
><b>V24.12.04</b></span
></span
>&nbsp;<span class="draft css-be9e2a">Draft</span
><svg
Expand Down Expand Up @@ -571,7 +571,7 @@ <h3>
<path
fill="currentColor"
d="M320 0c-17.7 0-32 14.3-32 32s14.3 32 32 32h82.7L201.4 265.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L448 109.3V192c0 17.7 14.3 32 32 32s32-14.3 32-32V32c0-17.7-14.3-32-32-32H320zM80 32C35.8 32 0 67.8 0 112V432c0 44.2 35.8 80 80 80H400c44.2 0 80-35.8 80-80V320c0-17.7-14.3-32-32-32s-32 14.3-32 32V432c0 8.8-7.2 16-16 16H80c-8.8 0-16-7.2-16-16V112c0-8.8 7.2-16 16-16H192c17.7 0 32-14.3 32-32s-14.3-32-32-32H80z"></path></svg
>View tests in V24.06.26</a
>View tests in V24.12.04</a
><button type="button" class="css-1c4pbk0 btn btn-primary">
<span
><span class="reports-missing css-fidnqg"></span>Some
Expand All @@ -582,7 +582,7 @@ <h3>
</div>
<div class="css-1iwfp5o">
<table
aria-label="Reports for Color Viewer Slider V24.06.26 in draft phase"
aria-label="Reports for Color Viewer Slider V24.12.04 in draft phase"
class="css-hfams3 table table-bordered">
<thead>
<tr>
Expand Down
4 changes: 4 additions & 0 deletions docs/local-development.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ yarn storybook
Any changes in the component will be picked up by the Storybook server.
#### Snapshot Testing
We use snapshot testing to detect regressions. These require upkeep since snapshots can become outdated by upstream test changes in aria-at. It is a good practice to routinely run `yarn update-snapshots` on your working branch.
### Accessibility testing
#### Manual accessibilty testing
Expand Down

0 comments on commit 939c33d

Please sign in to comment.