Skip to content

Commit 77ba1d4

Browse files
howard-estalgiag
andauthored
fix: Support older imported TestPlanVersions in automation (#1634)
* Conditional check to remove 'apg/' from TestPlanVersion.directory when running automation for TestPlanVersions imported before subfolder change in w3c/aria-at@01923da * Update snapshots * Update snapshots --------- Co-authored-by: Stalgia Grigg <[email protected]>
1 parent 62e1fd7 commit 77ba1d4

File tree

3 files changed

+67
-5
lines changed

3 files changed

+67
-5
lines changed

client/tests/e2e/snapshots/saved/_account_settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ <h2>Admin Actions</h2>
102102
<button type="button" class="btn btn-primary">
103103
Import Latest Test Plan Versions
104104
</button>
105-
<p>Date of latest test plan version: November 6, 2025 21:57 UTC</p>
105+
<p>Date of latest test plan version: November 10, 2025 06:01 UTC</p>
106106
</section>
107107
</main>
108108
</div>

client/tests/e2e/snapshots/saved/_data-management.html

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ <h3 class="disclosure-heading">
294294
<option value="103">Tabs with Manual Activation</option>
295295
<option value="104">Toggle Button</option>
296296
<option value="105">Vertical Temperature Slider</option>
297+
<option value="106">aria-required on a Text Input</option>
297298
</select>
298299
</div>
299300
<div class="form-group">
@@ -393,7 +394,7 @@ <h2>Test Plans Status Summary</h2>
393394
data-testid="filter-all"
394395
aria-pressed="true"
395396
class="filter-button btn active btn-secondary">
396-
All Plans (40)
397+
All Plans (41)
397398
</button>
398399
</li>
399400
<li>
@@ -402,7 +403,7 @@ <h2>Test Plans Status Summary</h2>
402403
data-testid="filter-rd"
403404
aria-pressed="false"
404405
class="filter-button btn btn-secondary">
405-
R&amp;D Complete (36)
406+
R&amp;D Complete (37)
406407
</button>
407408
</li>
408409
<li>
@@ -436,7 +437,7 @@ <h2>Test Plans Status Summary</h2>
436437
<div class="table-responsive">
437438
<table
438439
aria-label="Test Plans Status Summary Table"
439-
aria-rowcount="40"
440+
aria-rowcount="41"
440441
class="data-management table table-bordered table-hover">
441442
<thead>
442443
<tr>
@@ -3009,6 +3010,60 @@ <h2>Test Plans Status Summary</h2>
30093010
</td>
30103011
<td><span class="none centered absolute">None Yet</span></td>
30113012
</tr>
3013+
<tr aria-rowindex="40">
3014+
<th>
3015+
<a href="/data-management/aria/aria-required-text-input"
3016+
><b>aria-required on a Text Input</b></a
3017+
>
3018+
</th>
3019+
<td>
3020+
<div>
3021+
<b>JAWS</b><span>, </span><b>NVDA</b><span> and </span
3022+
><b>VoiceOver for macOS</b>
3023+
</div>
3024+
</td>
3025+
<td>
3026+
<div class="status-cell">
3027+
<span class="pill full-width rd">R&amp;D</span>
3028+
<p class="review-text">Complete <b>Nov 10, 2025</b></p>
3029+
</div>
3030+
</td>
3031+
<td>
3032+
<div class="phase-cell" role="list" aria-setsize="2">
3033+
<span class="styled-pill full-width auto-width"
3034+
><a href="/test-review/106"
3035+
><span
3036+
><svg
3037+
aria-hidden="true"
3038+
focusable="false"
3039+
data-prefix="fas"
3040+
data-icon="circle-check"
3041+
class="svg-inline--fa fa-circle-check check"
3042+
role="img"
3043+
xmlns="http://www.w3.org/2000/svg"
3044+
viewBox="0 0 512 512"
3045+
color="var(--positive-green)">
3046+
<path
3047+
fill="currentColor"
3048+
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
3049+
><b>V25.11.10</b></span
3050+
></a
3051+
></span
3052+
><button
3053+
type="button"
3054+
class="advance-button btn btn-secondary">
3055+
Advance to Draft
3056+
</button>
3057+
</div>
3058+
</td>
3059+
<td>
3060+
<span class="none centered absolute">Not Started</span>
3061+
</td>
3062+
<td>
3063+
<span class="none centered absolute">Not Started</span>
3064+
</td>
3065+
<td><span class="none centered absolute">None Yet</span></td>
3066+
</tr>
30123067
</tbody>
30133068
</table>
30143069
</div>

server/models/services/CollectionJobService.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,14 @@ const getCollectionJobs = async ({
405405
*/
406406
const triggerWorkflow = async (job, testIds, atVersion, { transaction }) => {
407407
const { testPlanVersion } = job.testPlanRun.testPlanReport;
408-
const { gitSha, directory } = testPlanVersion;
408+
let { gitSha, directory, updatedAt } = testPlanVersion;
409+
410+
const testPlanVersionCommitDate = new Date(updatedAt);
411+
const preApgTestsDate = new Date('2025-11-06 11:57:41.000000 +00:00');
412+
if (testPlanVersionCommitDate < preApgTestsDate) {
413+
directory = directory.replace('apg/', '');
414+
}
415+
409416
try {
410417
if (isGithubWorkflowEnabled()) {
411418
// TODO: pass the reduced list of testIds along / deal with them somehow

0 commit comments

Comments
 (0)