From 16da9b784a3fbb4a9c4b62103c0044fa96b5a74c Mon Sep 17 00:00:00 2001 From: "Keith J. Grant" Date: Mon, 12 Sep 2022 13:54:00 -0700 Subject: [PATCH] add schedule integration test locators --- .../ScheduleDetail/FrequencyDetails.js | 23 +++- .../Schedule/ScheduleDetail/ScheduleDetail.js | 105 ++++++++++++------ 2 files changed, 91 insertions(+), 37 deletions(-) diff --git a/awx/ui/src/components/Schedule/ScheduleDetail/FrequencyDetails.js b/awx/ui/src/components/Schedule/ScheduleDetail/FrequencyDetails.js index bb54aa6f62..4bde844499 100644 --- a/awx/ui/src/components/Schedule/ScheduleDetail/FrequencyDetails.js +++ b/awx/ui/src/components/Schedule/ScheduleDetail/FrequencyDetails.js @@ -83,6 +83,8 @@ export default function FrequencyDetails({ 6: t`Sunday`, }; + const prefix = isException ? `exception-${type}` : `frequency-${type}`; + return (
@@ -90,6 +92,7 @@ export default function FrequencyDetails({ {type === 'week' ? ( weekdays[d.weekday]) .join(', ')} + dataCy={`${prefix}-days-of-week`} /> ) : null} - - + +
); @@ -113,11 +121,15 @@ function sortWeekday(a, b) { return a.weekday - b.weekday; } -function RunOnDetail({ type, options }) { +function RunOnDetail({ type, options, prefix }) { if (type === 'month') { if (options.runOn === 'day') { return ( - + ); } const dayOfWeek = options.runOnTheDay; @@ -138,6 +150,7 @@ function RunOnDetail({ type, options }) { /> ) } + dataCy={`${prefix}-run-on-day`} /> ); } @@ -161,6 +174,7 @@ function RunOnDetail({ type, options }) { ); } @@ -195,6 +209,7 @@ function RunOnDetail({ type, options }) { /> ) } + dataCy={`${prefix}-run-on-day`} /> ); } diff --git a/awx/ui/src/components/Schedule/ScheduleDetail/ScheduleDetail.js b/awx/ui/src/components/Schedule/ScheduleDetail/ScheduleDetail.js index 7abca5bb59..228e0e0263 100644 --- a/awx/ui/src/components/Schedule/ScheduleDetail/ScheduleDetail.js +++ b/awx/ui/src/components/Schedule/ScheduleDetail/ScheduleDetail.js @@ -278,64 +278,84 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, surveyConfig }) { isDisabled={isDisabled} /> - - + + + - {frequency.length ? ( -

- {t`Frequency Details`} -

- {frequency.map((freq) => ( - - ))} +
+

+ {t`Frequency Details`} +

+ {frequency.map((freq) => ( + + ))} +
) : null} {exceptionFrequency.length ? ( -

- {t`Frequency Exception Details`} -

- {exceptionFrequency.map((freq) => ( - - ))} +
+

+ {t`Frequency Exception Details`} +

+ {exceptionFrequency.map((freq) => ( + + ))} +
) : null} {hasDaysToKeepField ? ( - + ) : null} {ask_job_type_on_launch && ( - + )} {showInventoryDetail && ( )} {ask_verbosity_on_launch && ( - + )} {ask_scm_branch_on_launch && ( - + + )} + {ask_limit_on_launch && ( + )} - {ask_limit_on_launch && } {showDiffModeDetail && ( )} {showCredentialsDetail && ( @@ -410,6 +446,7 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, surveyConfig }) { ))} } + dataCy="schedule-credentials" /> )} {showTagsDetail && ( @@ -433,6 +470,7 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, surveyConfig }) { ))} } + dataCy="schedule-job-tags" /> )} {showSkipTagsDetail && ( @@ -456,6 +494,7 @@ function ScheduleDetail({ hasDaysToKeepField, schedule, surveyConfig }) { ))} } + dataCy="schedule-skip-tags" /> )} {showVariablesDetail && (