From df3e2037c313b916fd93f601d92f6053beba90b3 Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Thu, 29 Feb 2024 15:18:53 -0500
Subject: [PATCH 01/11] Add recent changes

---
 .../InstructionsRenderer.jsx                  | 78 +++++++++++++++++--
 shared/convertAssertionPriority.js            |  7 +-
 2 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
index abf723901..05a706228 100644
--- a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
+++ b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
-import { Button } from 'react-bootstrap';
+import { Button, Table } from 'react-bootstrap';
 import { unescape } from 'lodash';
 import {
     parseListContent,
@@ -19,6 +19,7 @@ import { TestWindow } from '../../../resources/aria-at-test-window.mjs';
 import { evaluateAtNameKey } from '../../../utils/aria.js';
 import commandsJson from '../../../resources/commands.json';
 import supportJson from '../../../resources/support.json';
+import { convertAssertionPriority } from 'shared';
 
 const NumberedList = styled.ol`
     counter-reset: numbered-list;
@@ -169,19 +170,82 @@ const InstructionsRenderer = ({
         commandsContent
     );
 
-    const assertions = [...pageContent.instructions.assertions.assertions];
-    const assertionsContent = parseListContent(assertions);
-
+    headingLevel = 5;
     const Heading = `h${headingLevel}`;
 
+    console.log(renderableContent)
+
     return (
         <>
             <NumberedList>{allInstructionsContent}</NumberedList>
-            <Heading>{pageContent.instructions.assertions.header}</Heading>
-            {pageContent.instructions.assertions.description}
-            <NumberedList>{assertionsContent}</NumberedList>
             {settingsContent.length ? settingsContent : null}
 
+            {renderableContent.commands.map(({ id, settings }, i) => {
+                debugger;
+                const settingsScreenText =
+                    renderableContent.target.at.raw.settings[settings]
+                        ?.screenText ?? '';
+
+                let mustCount = 0;
+                let shouldCount = 0;
+                let mayCount = 0;
+
+                renderableContent.assertions.forEach(({ priority }) => {
+                    const priorityString = convertAssertionPriority(priority);
+                    if (priorityString === 'MUST') mustCount += 1;
+                    if (priorityString === 'SHOULD') shouldCount += 1;
+                    if (priorityString === 'MAY') mayCount += 1;
+                });
+
+                const settingsScreenTextFormatted =
+                    settingsScreenText === '' ? '' : ` (${settingsScreenText})`;
+
+                const scenarioTitle =
+                    `${renderableContent.commands[i].keystroke}` +
+                    `${settingsScreenTextFormatted}: ${mustCount} MUST, ` +
+                    `${shouldCount} SHOULD, ${mayCount} MAY Assertions`;
+
+                return (
+                    <>
+                        <Heading>{scenarioTitle}</Heading>
+                        <Table
+                            key={`${id}-${i}`}
+                            bordered
+                            responsive
+                            aria-label={`Results for test ${test.title}`}
+                        >
+                            <thead>
+                                <tr>
+                                    <th>Priority</th>
+                                    <th>Assertion Phrase</th>
+                                    <th>Assertion Statement</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                {renderableContent.assertions.map(
+                                    ({
+                                        assertionPhrase,
+                                        assertionStatement,
+                                        priority,
+                                        assertionId
+                                    }) => (
+                                        <tr key={`${i}-${assertionId}`}>
+                                            <td>
+                                                {convertAssertionPriority(
+                                                    priority
+                                                )}
+                                            </td>
+                                            <td>{assertionPhrase}</td>
+                                            <td>{assertionStatement}</td>
+                                        </tr>
+                                    )
+                                )}
+                            </tbody>
+                        </Table>
+                    </>
+                );
+            })}
+
             <Button
                 disabled={!pageContent.instructions.openTestPage.enabled}
                 onClick={pageContent.instructions.openTestPage.click}
diff --git a/shared/convertAssertionPriority.js b/shared/convertAssertionPriority.js
index 9265ae177..e191873f0 100644
--- a/shared/convertAssertionPriority.js
+++ b/shared/convertAssertionPriority.js
@@ -8,14 +8,13 @@
  * @returns {null|string}
  */
 const convertAssertionPriority = priority => {
-    const validInputRegex =
-        /^(0|1|2|3|EXCLUDE|REQUIRED|MUST|OPTIONAL|SHOULD|MAY)$/;
+    const validInputRegex = /^(0|1|2|3|EXCLUDE|MUST|SHOULD|MAY)$/;
 
     if (!validInputRegex.test(priority)) return null;
 
     if (priority === 0) return 'EXCLUDE';
-    if (priority === 'REQUIRED' || priority === 1) return 'MUST';
-    if (priority === 'OPTIONAL' || priority === 2) return 'SHOULD';
+    if (priority === 1) return 'MUST';
+    if (priority === 2) return 'SHOULD';
     if (priority === 3) return 'MAY';
     return priority;
 };

From ab84428cea050e634848a0333615a13a27556696 Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Thu, 29 Feb 2024 17:00:32 -0500
Subject: [PATCH 02/11] Adjust for test version

---
 .../InstructionsRenderer.jsx                  | 138 ++++++++++++------
 1 file changed, 92 insertions(+), 46 deletions(-)

diff --git a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
index 05a706228..f09a33dcf 100644
--- a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
+++ b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
@@ -173,18 +173,17 @@ const InstructionsRenderer = ({
     headingLevel = 5;
     const Heading = `h${headingLevel}`;
 
-    console.log(renderableContent)
-
     return (
         <>
             <NumberedList>{allInstructionsContent}</NumberedList>
             {settingsContent.length ? settingsContent : null}
 
             {renderableContent.commands.map(({ id, settings }, i) => {
-                debugger;
-                const settingsScreenText =
-                    renderableContent.target.at.raw.settings[settings]
-                        ?.screenText ?? '';
+                // debugger;
+                const settingsScreenText = isV2
+                    ? renderableContent.target.at.raw.settings[settings]
+                          ?.screenText ?? ''
+                    : null;
 
                 let mustCount = 0;
                 let shouldCount = 0;
@@ -198,52 +197,99 @@ const InstructionsRenderer = ({
                 });
 
                 const settingsScreenTextFormatted =
-                    settingsScreenText === '' ? '' : ` (${settingsScreenText})`;
+                    settingsScreenText === null
+                        ? ''
+                        : ` (${settingsScreenText})`;
 
                 const scenarioTitle =
                     `${renderableContent.commands[i].keystroke}` +
                     `${settingsScreenTextFormatted}: ${mustCount} MUST, ` +
                     `${shouldCount} SHOULD, ${mayCount} MAY Assertions`;
 
-                return (
-                    <>
-                        <Heading>{scenarioTitle}</Heading>
-                        <Table
-                            key={`${id}-${i}`}
-                            bordered
-                            responsive
-                            aria-label={`Results for test ${test.title}`}
-                        >
-                            <thead>
-                                <tr>
-                                    <th>Priority</th>
-                                    <th>Assertion Phrase</th>
-                                    <th>Assertion Statement</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                {renderableContent.assertions.map(
-                                    ({
-                                        assertionPhrase,
-                                        assertionStatement,
-                                        priority,
-                                        assertionId
-                                    }) => (
-                                        <tr key={`${i}-${assertionId}`}>
-                                            <td>
-                                                {convertAssertionPriority(
-                                                    priority
-                                                )}
-                                            </td>
-                                            <td>{assertionPhrase}</td>
-                                            <td>{assertionStatement}</td>
-                                        </tr>
-                                    )
-                                )}
-                            </tbody>
-                        </Table>
-                    </>
-                );
+                if (isV2) {
+                    return (
+                        <>
+                            <Heading
+                                id={renderableContent.commands[i].keystroke}
+                            >
+                                {scenarioTitle}
+                            </Heading>
+                            <Table
+                                key={`${id}-${i}`}
+                                bordered
+                                responsive
+                                aria-labelledby={
+                                    renderableContent.commands[i].keystroke
+                                }
+                            >
+                                <thead>
+                                    <tr>
+                                        <th>Priority</th>
+                                        <th>Assertion Phrase</th>
+                                        <th>Assertion Statement</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {renderableContent.assertions.map(
+                                        ({
+                                            assertionPhrase,
+                                            assertionStatement,
+                                            priority,
+                                            assertionId
+                                        }) => (
+                                            <tr key={`${i}-${assertionId}`}>
+                                                <td>
+                                                    {convertAssertionPriority(
+                                                        priority
+                                                    )}
+                                                </td>
+                                                <td>{assertionPhrase}</td>
+                                                <td>{assertionStatement}</td>
+                                            </tr>
+                                        )
+                                    )}
+                                </tbody>
+                            </Table>
+                        </>
+                    );
+                } else {
+                    return (
+                        <>
+                            <Heading>{scenarioTitle}</Heading>
+                            <Table
+                                key={`${id}-${i}`}
+                                bordered
+                                responsive
+                                aria-label={`Results for test ${test.title}`}
+                            >
+                                <thead>
+                                    <tr>
+                                        <th>Priority</th>
+                                        <th>Assertion Statement</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    {renderableContent.assertions.map(
+                                        ({
+                                            expectation,
+                                            priority,
+                                            assertionId
+                                        }) => (
+                                            <tr key={`${i}-${assertionId}`}>
+                                                <td>
+                                                    {convertAssertionPriority(
+                                                        priority
+                                                    )}
+                                                </td>
+                                                <td>{expectation}</td>
+                                            </tr>
+                                        )
+                                    )}
+                                </tbody>
+                            </Table>
+                        </>
+                    );
+                }
             })}
 
             <Button

From d5603da572ead77b58b25acc57494e2633f99279 Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Thu, 29 Feb 2024 18:26:06 -0500
Subject: [PATCH 03/11] Fix failing test

---
 shared/tests/convertAssertionPriority.test.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/shared/tests/convertAssertionPriority.test.js b/shared/tests/convertAssertionPriority.test.js
index cccafce82..ca025f8f1 100644
--- a/shared/tests/convertAssertionPriority.test.js
+++ b/shared/tests/convertAssertionPriority.test.js
@@ -6,11 +6,9 @@ describe('Verify expected values are returned when calling convertAssertionPrior
         const excludePriorityB = convertAssertionPriority('EXCLUDE');
 
         const mustPriorityA = convertAssertionPriority(1);
-        const mustPriorityB = convertAssertionPriority('REQUIRED');
         const mustPriorityC = convertAssertionPriority('MUST');
 
         const shouldPriorityA = convertAssertionPriority(2);
-        const shouldPriorityB = convertAssertionPriority('OPTIONAL');
         const shouldPriorityC = convertAssertionPriority('SHOULD');
 
         const mayPriorityA = convertAssertionPriority(3);
@@ -20,11 +18,9 @@ describe('Verify expected values are returned when calling convertAssertionPrior
         expect(excludePriorityB).toEqual('EXCLUDE');
 
         expect(mustPriorityA).toEqual('MUST');
-        expect(mustPriorityB).toEqual('MUST');
         expect(mustPriorityC).toEqual('MUST');
 
         expect(shouldPriorityA).toEqual('SHOULD');
-        expect(shouldPriorityB).toEqual('SHOULD');
         expect(shouldPriorityC).toEqual('SHOULD');
 
         expect(mayPriorityA).toEqual('MAY');

From 96721fe02bf0b872a9c5c7b3c8b3c4e008c0acf0 Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:02:54 -0500
Subject: [PATCH 04/11] Account for assertionExceptions

---
 .../InstructionsRenderer.jsx                  | 233 ++++++++++--------
 server/scripts/import-tests/index.js          |   3 +-
 2 files changed, 128 insertions(+), 108 deletions(-)

diff --git a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
index f09a33dcf..b83e55286 100644
--- a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
+++ b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
@@ -178,119 +178,138 @@ const InstructionsRenderer = ({
             <NumberedList>{allInstructionsContent}</NumberedList>
             {settingsContent.length ? settingsContent : null}
 
-            {renderableContent.commands.map(({ id, settings }, i) => {
-                // debugger;
-                const settingsScreenText = isV2
-                    ? renderableContent.target.at.raw.settings[settings]
-                          ?.screenText ?? ''
-                    : null;
+            {renderableContent.commands.map(
+                ({ id, settings, assertionExceptions = [] }, i) => {
+                    const settingsScreenText = isV2
+                        ? renderableContent.target.at.raw.settings[settings]
+                              ?.screenText ?? ''
+                        : null;
 
-                let mustCount = 0;
-                let shouldCount = 0;
-                let mayCount = 0;
+                    let mustCount = 0;
+                    let shouldCount = 0;
+                    let mayCount = 0;
 
-                renderableContent.assertions.forEach(({ priority }) => {
-                    const priorityString = convertAssertionPriority(priority);
-                    if (priorityString === 'MUST') mustCount += 1;
-                    if (priorityString === 'SHOULD') shouldCount += 1;
-                    if (priorityString === 'MAY') mayCount += 1;
-                });
+                    let assertions = [...renderableContent.assertions];
 
-                const settingsScreenTextFormatted =
-                    settingsScreenText === null
-                        ? ''
-                        : ` (${settingsScreenText})`;
+                    assertionExceptions.forEach(exception => {
+                        const assertionIndex = assertions.findIndex(
+                            assertion => {
+                                return (
+                                    assertion.assertionId ===
+                                    exception.assertionId
+                                );
+                            }
+                        );
+                        if (exception.priority === 0) {
+                            assertions.splice(assertionIndex, 1);
+                        } else {
+                            assertions[assertionIndex].priority =
+                                exception.priority;
+                        }
+                    });
 
-                const scenarioTitle =
-                    `${renderableContent.commands[i].keystroke}` +
-                    `${settingsScreenTextFormatted}: ${mustCount} MUST, ` +
-                    `${shouldCount} SHOULD, ${mayCount} MAY Assertions`;
+                    assertions.forEach(({ priority }) => {
+                        const priorityString =
+                            convertAssertionPriority(priority);
+                        if (priorityString === 'MUST') mustCount += 1;
+                        if (priorityString === 'SHOULD') shouldCount += 1;
+                        if (priorityString === 'MAY') mayCount += 1;
+                    });
 
-                if (isV2) {
-                    return (
-                        <>
-                            <Heading
-                                id={renderableContent.commands[i].keystroke}
-                            >
-                                {scenarioTitle}
-                            </Heading>
-                            <Table
-                                key={`${id}-${i}`}
-                                bordered
-                                responsive
-                                aria-labelledby={
-                                    renderableContent.commands[i].keystroke
-                                }
-                            >
-                                <thead>
-                                    <tr>
-                                        <th>Priority</th>
-                                        <th>Assertion Phrase</th>
-                                        <th>Assertion Statement</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {renderableContent.assertions.map(
-                                        ({
-                                            assertionPhrase,
-                                            assertionStatement,
-                                            priority,
-                                            assertionId
-                                        }) => (
-                                            <tr key={`${i}-${assertionId}`}>
-                                                <td>
-                                                    {convertAssertionPriority(
-                                                        priority
-                                                    )}
-                                                </td>
-                                                <td>{assertionPhrase}</td>
-                                                <td>{assertionStatement}</td>
-                                            </tr>
-                                        )
-                                    )}
-                                </tbody>
-                            </Table>
-                        </>
-                    );
-                } else {
-                    return (
-                        <>
-                            <Heading>{scenarioTitle}</Heading>
-                            <Table
-                                key={`${id}-${i}`}
-                                bordered
-                                responsive
-                                aria-label={`Results for test ${test.title}`}
-                            >
-                                <thead>
-                                    <tr>
-                                        <th>Priority</th>
-                                        <th>Assertion Statement</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    {renderableContent.assertions.map(
-                                        ({
-                                            expectation,
-                                            priority,
-                                            assertionId
-                                        }) => (
-                                            <tr key={`${i}-${assertionId}`}>
-                                                <td>
-                                                    {convertAssertionPriority(
-                                                        priority
-                                                    )}
-                                                </td>
-                                                <td>{expectation}</td>
-                                            </tr>
-                                        )
-                                    )}
-                                </tbody>
-                            </Table>
-                        </>
-                    );
+                    const settingsScreenTextFormatted =
+                        settingsScreenText === null
+                            ? ''
+                            : ` (${settingsScreenText})`;
+
+                    const scenarioTitle =
+                        `${renderableContent.commands[i].keystroke}` +
+                        `${settingsScreenTextFormatted}: ${mustCount} MUST, ` +
+                        `${shouldCount} SHOULD, ${mayCount} MAY Assertions`;
+
+                    if (isV2) {
+                        return (
+                            <React.Fragment key={`command-${id}-${i}`}>
+                                <Heading
+                                    id={renderableContent.commands[i].keystroke}
+                                >
+                                    {scenarioTitle}
+                                </Heading>
+                                <Table
+                                    key={`${id}-${i}`}
+                                    bordered
+                                    responsive
+                                    aria-labelledby={
+                                        renderableContent.commands[i].keystroke
+                                    }
+                                >
+                                    <thead>
+                                        <tr>
+                                            <th>Priority</th>
+                                            <th>Assertion Phrase</th>
+                                            <th>Assertion Statement</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        {assertions.map(
+                                            ({
+                                                assertionPhrase,
+                                                assertionStatement,
+                                                priority,
+                                                assertionId
+                                            }) => (
+                                                <tr key={`${i}-${assertionId}`}>
+                                                    <td>
+                                                        {convertAssertionPriority(
+                                                            priority
+                                                        )}
+                                                    </td>
+                                                    <td>{assertionPhrase}</td>
+                                                    <td>
+                                                        {assertionStatement}
+                                                    </td>
+                                                </tr>
+                                            )
+                                        )}
+                                    </tbody>
+                                </Table>
+                            </React.Fragment>
+                        );
+                    } else {
+                        return (
+                            <React.Fragment key={`command-${id}-${i}`}>
+                                <Heading>{scenarioTitle}</Heading>
+                                <Table
+                                    key={`${id}-${i}`}
+                                    bordered
+                                    responsive
+                                    aria-label={`Results for test ${test.title}`}
+                                >
+                                    <thead>
+                                        <tr>
+                                            <th>Priority</th>
+                                            <th>Assertion Statement</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        {assertions.map(
+                                            ({ expectation, priority }) => (
+                                                <tr key={`${i}-${expectation}`}>
+                                                    <td>
+                                                        {convertAssertionPriority(
+                                                            priority
+                                                        )}
+                                                    </td>
+                                                    <td>{expectation}</td>
+                                                </tr>
+                                            )
+                                        )}
+                                    </tbody>
+                                </Table>
+                            </React.Fragment>
+                        );
+                    }
                 }
-            })}
+            )}
 
             <Button
                 disabled={!pageContent.instructions.openTestPage.enabled}
diff --git a/server/scripts/import-tests/index.js b/server/scripts/import-tests/index.js
index 5c977fcd2..4c4034f4c 100644
--- a/server/scripts/import-tests/index.js
+++ b/server/scripts/import-tests/index.js
@@ -54,7 +54,8 @@ Default use:
 const client = new Client();
 
 const ariaAtRepo = 'https://github.com/w3c/aria-at.git';
-const ariaAtDefaultBranch = 'master';
+// const ariaAtDefaultBranch = 'master';
+const ariaAtDefaultBranch = 'main';
 const gitCloneDirectory = path.resolve(__dirname, 'tmp');
 const builtTestsDirectory = path.resolve(gitCloneDirectory, 'build', 'tests');
 const testsDirectory = path.resolve(gitCloneDirectory, 'tests');

From 12d3f7ffa9ce58732c2e075e87750bda2f043deb Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:05:19 -0500
Subject: [PATCH 05/11] Revert changes to assertion file

---
 shared/convertAssertionPriority.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shared/convertAssertionPriority.js b/shared/convertAssertionPriority.js
index e191873f0..9265ae177 100644
--- a/shared/convertAssertionPriority.js
+++ b/shared/convertAssertionPriority.js
@@ -8,13 +8,14 @@
  * @returns {null|string}
  */
 const convertAssertionPriority = priority => {
-    const validInputRegex = /^(0|1|2|3|EXCLUDE|MUST|SHOULD|MAY)$/;
+    const validInputRegex =
+        /^(0|1|2|3|EXCLUDE|REQUIRED|MUST|OPTIONAL|SHOULD|MAY)$/;
 
     if (!validInputRegex.test(priority)) return null;
 
     if (priority === 0) return 'EXCLUDE';
-    if (priority === 1) return 'MUST';
-    if (priority === 2) return 'SHOULD';
+    if (priority === 'REQUIRED' || priority === 1) return 'MUST';
+    if (priority === 'OPTIONAL' || priority === 2) return 'SHOULD';
     if (priority === 3) return 'MAY';
     return priority;
 };

From 3c2c047afe259eee2d62fa92e9f61aaf1723062c Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:50:48 -0500
Subject: [PATCH 06/11] Change main to master

---
 server/scripts/import-tests/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/scripts/import-tests/index.js b/server/scripts/import-tests/index.js
index 4c4034f4c..233c45339 100644
--- a/server/scripts/import-tests/index.js
+++ b/server/scripts/import-tests/index.js
@@ -55,7 +55,7 @@ const client = new Client();
 
 const ariaAtRepo = 'https://github.com/w3c/aria-at.git';
 // const ariaAtDefaultBranch = 'master';
-const ariaAtDefaultBranch = 'main';
+const ariaAtDefaultBranch = 'master';
 const gitCloneDirectory = path.resolve(__dirname, 'tmp');
 const builtTestsDirectory = path.resolve(gitCloneDirectory, 'build', 'tests');
 const testsDirectory = path.resolve(gitCloneDirectory, 'tests');

From 11e5a68a11a3ef4c81a619b8f3c949514455dd01 Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:54:43 -0500
Subject: [PATCH 07/11] Remove comment

---
 server/scripts/import-tests/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/scripts/import-tests/index.js b/server/scripts/import-tests/index.js
index 233c45339..5c977fcd2 100644
--- a/server/scripts/import-tests/index.js
+++ b/server/scripts/import-tests/index.js
@@ -54,7 +54,6 @@ Default use:
 const client = new Client();
 
 const ariaAtRepo = 'https://github.com/w3c/aria-at.git';
-// const ariaAtDefaultBranch = 'master';
 const ariaAtDefaultBranch = 'master';
 const gitCloneDirectory = path.resolve(__dirname, 'tmp');
 const builtTestsDirectory = path.resolve(gitCloneDirectory, 'build', 'tests');

From 53a33b84cb96037c52383136916b43654155d6c1 Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Mon, 4 Mar 2024 15:56:25 -0500
Subject: [PATCH 08/11] Revert changes to convert assertion test file

---
 shared/tests/convertAssertionPriority.test.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/shared/tests/convertAssertionPriority.test.js b/shared/tests/convertAssertionPriority.test.js
index ca025f8f1..cccafce82 100644
--- a/shared/tests/convertAssertionPriority.test.js
+++ b/shared/tests/convertAssertionPriority.test.js
@@ -6,9 +6,11 @@ describe('Verify expected values are returned when calling convertAssertionPrior
         const excludePriorityB = convertAssertionPriority('EXCLUDE');
 
         const mustPriorityA = convertAssertionPriority(1);
+        const mustPriorityB = convertAssertionPriority('REQUIRED');
         const mustPriorityC = convertAssertionPriority('MUST');
 
         const shouldPriorityA = convertAssertionPriority(2);
+        const shouldPriorityB = convertAssertionPriority('OPTIONAL');
         const shouldPriorityC = convertAssertionPriority('SHOULD');
 
         const mayPriorityA = convertAssertionPriority(3);
@@ -18,9 +20,11 @@ describe('Verify expected values are returned when calling convertAssertionPrior
         expect(excludePriorityB).toEqual('EXCLUDE');
 
         expect(mustPriorityA).toEqual('MUST');
+        expect(mustPriorityB).toEqual('MUST');
         expect(mustPriorityC).toEqual('MUST');
 
         expect(shouldPriorityA).toEqual('SHOULD');
+        expect(shouldPriorityB).toEqual('SHOULD');
         expect(shouldPriorityC).toEqual('SHOULD');
 
         expect(mayPriorityA).toEqual('MAY');

From 2e218aa24bb9f787c3e583065054edf1922297c4 Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:35:24 -0500
Subject: [PATCH 09/11] Fix empty parantheses in UI

---
 .../CandidateTestPlanRun/InstructionsRenderer.jsx  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
index b83e55286..c2e883f6f 100644
--- a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
+++ b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
@@ -216,10 +216,16 @@ const InstructionsRenderer = ({
                         if (priorityString === 'MAY') mayCount += 1;
                     });
 
-                    const settingsScreenTextFormatted =
-                        settingsScreenText === null
-                            ? ''
-                            : ` (${settingsScreenText})`;
+                    let settingsScreenTextFormatted;
+
+                    if (
+                        settingsScreenText === null ||
+                        settingsScreenText === ''
+                    ) {
+                        settingsScreenTextFormatted = '';
+                    } else {
+                        settingsScreenTextFormatted = ` (${settingsScreenText})`;
+                    }
 
                     const scenarioTitle =
                         `${renderableContent.commands[i].keystroke}` +

From a05500e586add721993b1def2d42eaf7585cac0f Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Tue, 5 Mar 2024 10:30:18 -0500
Subject: [PATCH 10/11] Finish making changes from deleted branch

---
 .../InstructionsRenderer.jsx                  |  1 -
 client/components/TestReview/index.jsx        | 33 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
index c2e883f6f..df331c6c8 100644
--- a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
+++ b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
@@ -170,7 +170,6 @@ const InstructionsRenderer = ({
         commandsContent
     );
 
-    headingLevel = 5;
     const Heading = `h${headingLevel}`;
 
     return (
diff --git a/client/components/TestReview/index.jsx b/client/components/TestReview/index.jsx
index fd7520768..60fe72e01 100644
--- a/client/components/TestReview/index.jsx
+++ b/client/components/TestReview/index.jsx
@@ -187,21 +187,17 @@ const TestReview = () => {
                     </Ul>
                 </li>
                 <li>
-                    <strong>Commit:&nbsp;</strong>
-                    {testPlanVersion.gitMessage}
+                    <strong>Latest Commit:&nbsp;</strong>
+                    <a
+                        target="_blank"
+                        rel="noreferrer"
+                        href={`https://github.com/w3c/aria-at/commit/${testPlanVersion.gitSha}`}
+                    >
+                        {testPlanVersion.gitMessage}
+                    </a>
                 </li>
             </ul>
-            <h2>Tests</h2>
-            <FilterButtonContainer>
-                <FilterButtons
-                    filterLabel="Filter tests by covered AT"
-                    filterOptions={filterOptions}
-                    activeFilter={activeFilter}
-                    onFilterChange={selectedFilter => {
-                        setActiveFilter(selectedFilter);
-                    }}
-                />
-            </FilterButtonContainer>
+
             <h2>Supporting Documentation</h2>
             <ul>
                 {testPlanVersionTests[0].renderableContents[0].renderableContent.info.references.map(
@@ -244,6 +240,17 @@ const TestReview = () => {
                     }
                 )}
             </ul>
+            <h2>Tests</h2>
+            <FilterButtonContainer>
+                <FilterButtons
+                    filterLabel="Filter tests by covered AT"
+                    filterOptions={filterOptions}
+                    activeFilter={activeFilter}
+                    onFilterChange={selectedFilter => {
+                        setActiveFilter(selectedFilter);
+                    }}
+                />
+            </FilterButtonContainer>
             {filteredTests.map((test, index) => {
                 const isFirst = index === 0;
                 const hasAriaReference =

From b40d24d1d44a33b2bad94c0d664e367aede4d53d Mon Sep 17 00:00:00 2001
From: Paul Clue <67766160+Paul-Clue@users.noreply.github.com>
Date: Tue, 5 Mar 2024 19:20:46 -0500
Subject: [PATCH 11/11] Combine falsy values

---
 .../CandidateTestPlanRun/InstructionsRenderer.jsx   | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
index df331c6c8..59973f29a 100644
--- a/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
+++ b/client/components/CandidateReview/CandidateTestPlanRun/InstructionsRenderer.jsx
@@ -215,16 +215,9 @@ const InstructionsRenderer = ({
                         if (priorityString === 'MAY') mayCount += 1;
                     });
 
-                    let settingsScreenTextFormatted;
-
-                    if (
-                        settingsScreenText === null ||
-                        settingsScreenText === ''
-                    ) {
-                        settingsScreenTextFormatted = '';
-                    } else {
-                        settingsScreenTextFormatted = ` (${settingsScreenText})`;
-                    }
+                    const settingsScreenTextFormatted = settingsScreenText
+                        ? ` (${settingsScreenText})`
+                        : '';
 
                     const scenarioTitle =
                         `${renderableContent.commands[i].keystroke}` +