@@ -177,6 +181,8 @@ const TestRunHeading = ({
TestRunHeading.propTypes = {
testPlanTitle: PropTypes.string.isRequired,
+ testPlanVersionString: PropTypes.string.isRequired,
+ testPlanVersionReviewLink: PropTypes.string.isRequired,
at: PropTypes.string.isRequired,
browser: PropTypes.string.isRequired,
showEditAtBrowser: PropTypes.bool.isRequired,
diff --git a/client/components/TestRun/index.jsx b/client/components/TestRun/index.jsx
index b6ca26d0c..3112497a1 100644
--- a/client/components/TestRun/index.jsx
+++ b/client/components/TestRun/index.jsx
@@ -39,7 +39,6 @@ import { evaluateAuth } from '../../utils/evaluateAuth';
import './TestRun.css';
import ReviewConflicts from '../ReviewConflicts';
import createIssueLink from '../../utils/createIssueLink';
-import { dates } from 'shared';
import { Provider as CollectionJobContextProvider } from './CollectionJobContext';
import { useUrlTestIndex } from '../../hooks/useUrlTestIndex';
@@ -360,16 +359,13 @@ const TestRun = () => {
}
adminReviewerCheckedRef.current = true;
- let issueLink;
+ let issueLink, commonIssueContent;
const hasLoadingCompleted = Object.keys(currentTest).length;
if (hasLoadingCompleted) {
- issueLink = createIssueLink({
+ commonIssueContent = {
testPlanTitle: testPlanVersion.title,
testPlanDirectory: testPlanVersion.testPlan.directory,
- versionString: `V${dates.convertDateToString(
- testPlanVersion.updatedAt,
- 'YY.MM.DD'
- )}`,
+ versionString: testPlanVersion.versionString,
testTitle: currentTest.title,
testRowNumber: currentTest.rowNumber,
testSequenceNumber: currentTest.seq,
@@ -379,7 +375,8 @@ const TestRun = () => {
atVersionName: currentAtVersion?.name,
browserVersionName: currentBrowserVersion?.name,
conflictMarkdown: conflictMarkdownRef.current
- });
+ };
+ issueLink = createIssueLink(commonIssueContent);
}
const remapScenarioResults = (
@@ -969,7 +966,7 @@ const TestRun = () => {
-
}
@@ -1051,6 +1048,7 @@ const TestRun = () => {
isSubmitted={isTestSubmitClicked}
isEdit={isTestEditClicked}
setIsRendererReady={setIsRendererReady}
+ commonIssueContent={commonIssueContent}
/>
{isRendererReady && (
@@ -1143,6 +1141,8 @@ const TestRun = () => {
testPlanTitle={
testPlanVersion.title || testPlanVersion.testPlan?.directory || ''
}
+ testPlanVersionString={testPlanVersion.versionString}
+ testPlanVersionReviewLink={`/test-review/${testPlanVersion.id}`}
at={`${testPlanReport.at?.name}${
isViewingRun ? ` ${currentAtVersion?.name}` : ''
}`}
diff --git a/client/components/common/AssignTesterDropdown/index.jsx b/client/components/common/AssignTesterDropdown/index.jsx
index 5d4cd9ceb..f3e1d3092 100644
--- a/client/components/common/AssignTesterDropdown/index.jsx
+++ b/client/components/common/AssignTesterDropdown/index.jsx
@@ -28,6 +28,7 @@ const AssignTesterDropdown = ({
possibleTesters,
onChange,
label,
+ disabled = false,
dropdownAssignTesterButtonRef,
setAlertMessage = () => {}
}) => {
@@ -139,6 +140,7 @@ const AssignTesterDropdown = ({
aria-label="Assign testers"
className="assign-tester"
variant="secondary"
+ disabled={disabled}
>
{renderLabel()}
@@ -216,7 +218,8 @@ AssignTesterDropdown.propTypes = {
label: PropTypes.string,
draftTestPlanRuns: PropTypes.arrayOf(TestPlanRunPropType),
setAlertMessage: PropTypes.func,
- dropdownAssignTesterButtonRef: PropTypes.object
+ dropdownAssignTesterButtonRef: PropTypes.object,
+ disabled: PropTypes.bool
};
export default AssignTesterDropdown;
diff --git a/client/tests/e2e/TestRun.e2e.test.js b/client/tests/e2e/TestRun.e2e.test.js
index 5386ceb8f..48ccdc997 100644
--- a/client/tests/e2e/TestRun.e2e.test.js
+++ b/client/tests/e2e/TestRun.e2e.test.js
@@ -336,7 +336,7 @@ describe('Test Run when signed in as tester', () => {
await page.waitForSelector('h1 ::-p-text(Test 1)');
await page.waitForSelector('button ::-p-text(Next Test)');
- const radioSelector = 'input[type="radio"]';
+ const radioSelector = 'input[type="radio"][id^="pass-"]';
const test1NavSelector = 'nav#test-navigator-nav ol li:nth-child(1)';
const test2NavSelector = 'nav#test-navigator-nav ol li:nth-child(2)';
const nextTestButtonSelector = 'button ::-p-text(Next Test)';
@@ -344,7 +344,7 @@ describe('Test Run when signed in as tester', () => {
// Randomly select radio buttons on first test
const generatedCheckedTest1Count =
- await getGeneratedCheckedAssertionCount(page, radioSelector);
+ await getGeneratedCheckedAssertionCount(page);
// Navigate to test 2 with navigation menu
await page.$eval(test2NavSelector, el => el.querySelector('a').click());
@@ -352,7 +352,7 @@ describe('Test Run when signed in as tester', () => {
await page.waitForSelector('h1 ::-p-text(Test 2:)');
await page.waitForSelector('button ::-p-text(Next Test)');
const generatedCheckedTest2Count =
- await getGeneratedCheckedAssertionCount(page, radioSelector);
+ await getGeneratedCheckedAssertionCount(page);
// Navigate to test 3 with next button
await page.click(nextTestButtonSelector);
diff --git a/client/tests/e2e/snapshots/saved/_candidate-test-plan_24_1.html b/client/tests/e2e/snapshots/saved/_candidate-test-plan_24_1.html
index 2f76d8bff..81b0004b7 100644
--- a/client/tests/e2e/snapshots/saved/_candidate-test-plan_24_1.html
+++ b/client/tests/e2e/snapshots/saved/_candidate-test-plan_24_1.html
@@ -739,7 +739,7 @@
Test Review Options
Test Review Options
class="test-info-entity apg-example-name"
data-testid="apg-example-name">