From 40a806793d2f1a30d3c6e41940feccd561dbd509 Mon Sep 17 00:00:00 2001 From: Jan Stourac Date: Thu, 7 Dec 2023 12:36:27 +0100 Subject: [PATCH] [Fix] capital letters for the particular menu sections These changes are based on this fix into ODH-Dashboard component [1,2]. Note: there is still an inconsistency for `Model Serving` menu item and relevant page title `Deployed models` which is gonna be handled by [3]. * [1] https://github.com/opendatahub-io/odh-dashboard/pull/2067 * [2] https://github.com/opendatahub-io/odh-dashboard/issues/1907 * [3] https://github.com/opendatahub-io/odh-dashboard/issues/2105 --- ods_ci/tests/Resources/ODS.robot | 6 +++--- .../ODH/ODHDashboard/ODHDashboardSettings.resource | 12 ++++++------ .../ODHDataScienceProject/Projects.resource | 2 +- .../Page/ODH/ODHDashboard/ODHModelServing.resource | 4 ++-- .../120__upgrades/120__pre_upgrades.robot | 2 +- .../410__ods_dashboard_settings.robot | 2 +- .../415__ods_dashboard_projects_additional.robot | 6 +++--- .../420__model_serving/420__model_serving.robot | 2 +- .../420__model_serving/421__model_serving_gpu.robot | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ods_ci/tests/Resources/ODS.robot b/ods_ci/tests/Resources/ODS.robot index 11622df42..02fad373d 100644 --- a/ods_ci/tests/Resources/ODS.robot +++ b/ods_ci/tests/Resources/ODS.robot @@ -62,20 +62,20 @@ Get "Usage Data Collection" Key Is Usage Data Collection Enabled [Documentation] Returns a boolean with the value of configmap odh-segment-key-config > segmentKeyEnabled - ... which can be seen also in ODS Dashboard > Cluster Settings > "Usage Data Collection" + ... which can be seen also in ODS Dashboard > Cluster settings > "Usage Data Collection" ${usage_data_collection_enabled}= Run ... oc get configmap odh-segment-key-config -n ${APPLICATIONS_NAMESPACE} -o jsonpath='{.data.segmentKeyEnabled}' ${usage_data_collection_enabled}= Convert To Boolean ${usage_data_collection_enabled} RETURN ${usage_data_collection_enabled} Usage Data Collection Should Be Enabled - [Documentation] Fails if "Usage Data Collection" is not enabled in ODS Dashboard > Cluster Settings + [Documentation] Fails if "Usage Data Collection" is not enabled in ODS Dashboard > Cluster settings [Arguments] ${msg}="Usage Data Collection" should be enabled ${enabled}= ODS.Is Usage Data Collection Enabled Should Be True ${enabled} msg=${msg} Usage Data Collection Should Not Be Enabled - [Documentation] Fails if "Usage Data Collection" is enabled in ODS Dashboard > Cluster Settings + [Documentation] Fails if "Usage Data Collection" is enabled in ODS Dashboard > Cluster settings [Arguments] ${msg}="Usage Data Collection" should not be enabled ${enabled}= ODS.Is Usage Data Collection Enabled Should Not Be True ${enabled} msg=${msg} diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource index 5ec804119..07df2436f 100644 --- a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource +++ b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDashboardSettings.resource @@ -117,7 +117,7 @@ Disable Pod Toleration Via UI Element Should Be Disabled xpath://input[@id="toleration-key-input"] Save Changes In Cluster Settings - [Documentation] Clicks on the "Save changes" button in Cluster Settings and + [Documentation] Clicks on the "Save changes" button in Cluster settings and ... waits until "Cluster settings changes saved" is shown Wait Until Page Contains Element xpath://button[.="Save changes"][@aria-disabled="false"] timeout=15s Click Button Save changes @@ -134,7 +134,7 @@ Save Changes In Cluster Settings Sleep 30s Enable "Usage Data Collection" - [Documentation] Once in Settings > Cluster Settings, enables "Usage Data Collection" + [Documentation] Once in Settings > Cluster settings, enables "Usage Data Collection" ${is_data_collection_enabled}= Run Keyword And Return Status Checkbox Should Be Selected ... ${USAGE_DATA_COLLECTION_XP} Set Test Variable ${is_data_collection_enabled} #robocop:disable @@ -144,7 +144,7 @@ Enable "Usage Data Collection" END Disable "Usage Data Collection" - [Documentation] Once in Settings > Cluster Settings, disables "Usage Data Collection" + [Documentation] Once in Settings > Cluster settings, disables "Usage Data Collection" ${is_data_collection_enabled}= Run Keyword And Return Status Checkbox Should Be Selected ... ${USAGE_DATA_COLLECTION_XP} Set Test Variable ${is_data_collection_enabled} #robocop:disable @@ -220,13 +220,13 @@ Open Dashboard Settings END Click Element xpath://a[.="${settings_page}"] IF "${settings_page}" == "Notebook images" - ${exp_page_title}= Set Variable Notebook images settings + ${exp_page_title}= Set Variable Notebook image settings ELSE IF "${settings_page}" == "Cluster settings" - ${exp_page_title}= Set Variable Cluster Settings + ${exp_page_title}= Set Variable Cluster settings ELSE IF "${settings_page}" == "Serving runtimes" ${exp_page_title}= Set Variable Serving runtimes ELSE IF "${settings_page}" == "User management" - ${exp_page_title}= Set Variable User and group settings + ${exp_page_title}= Set Variable User management END Wait For RHODS Dashboard To Load expected_page=${exp_page_title} ... wait_for_cards=${FALSE} diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource index 23ecef97e..dd89494fc 100644 --- a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource +++ b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHDataScienceProject/Projects.resource @@ -5,7 +5,7 @@ Resource ./Workbenches.resource *** Variables *** -${DS_PROJECT_XP}= xpath=//h1[text()="Data science projects"] +${DS_PROJECT_XP}= xpath=//h1[text()="Data Science Projects"] ${TITLE_INPUT_XP}= xpath=//input[@id="manage-project-modal-name"] ${DESCR_INPUT_XP}= xpath=//textarea[@id="manage-project-modal-description"] ${RESOURCE_INPUT_XP}= xpath=//input[@id="resource-manage-project-modal-name"] diff --git a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource index 95e3c5852..943dc3a8b 100644 --- a/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource +++ b/ods_ci/tests/Resources/Page/ODH/ODHDashboard/ODHModelServing.resource @@ -7,7 +7,7 @@ Library ../../../../../libs/Helpers.py *** Variables *** -${MS_HEADER_XP}= xpath=//h1[text()="Model serving"] +${MS_HEADER_XP}= xpath=//h1[text()="Model Serving"] ${S3_NAME_DC_INPUT_XP}= xpath=//input[@aria-label="Field list Name"] ${S3_KEY_DC_INPUT_XP}= xpath=//input[@aria-label="Field list AWS_ACCESS_KEY_ID"] ${S3_SECRET_DC_INPUT_XP}= xpath=//input[@aria-label="Field list AWS_SECRET_ACCESS_KEY"] @@ -31,7 +31,7 @@ Open Model Serving Home Page [Documentation] Verifies submenu Settings > "Model Serving" is visible and navigates to page Page Should Contain Model Serving Click Link Model Serving - # Replace sleep with better Wait keyword. Confirm if error page has "Model serving" h1 element. + # Replace sleep with better Wait keyword. Confirm if error page has "Model Serving" h1 element. Sleep 1s ${loading_error} = Run Keyword And Return Status Page Should Contain Problem loading model serving page IF ${loading_error} diff --git a/ods_ci/tests/Tests/100__deploy/120__upgrades/120__pre_upgrades.robot b/ods_ci/tests/Tests/100__deploy/120__upgrades/120__pre_upgrades.robot index c23722bef..72a4356e4 100644 --- a/ods_ci/tests/Tests/100__deploy/120__upgrades/120__pre_upgrades.robot +++ b/ods_ci/tests/Tests/100__deploy/120__upgrades/120__pre_upgrades.robot @@ -155,7 +155,7 @@ Clean Up DSP Page END Delete Data Science Projects From CLI ${projects} Reload Page - Wait Until Page Contains Data science projects + Wait Until Page Contains Data Science Projects END Verify Openvino Deployment diff --git a/ods_ci/tests/Tests/400__ods_dashboard/410__ods_dashboard_settings.robot b/ods_ci/tests/Tests/400__ods_dashboard/410__ods_dashboard_settings.robot index 39293ca14..e3eb20b62 100644 --- a/ods_ci/tests/Tests/400__ods_dashboard/410__ods_dashboard_settings.robot +++ b/ods_ci/tests/Tests/400__ods_dashboard/410__ods_dashboard_settings.robot @@ -35,7 +35,7 @@ Verify That Not Admin Users Can Not Access "Cluster Settings" [Teardown] Dashboard Settings Test Teardown Verify That "Usage Data Collection" Can Be Set In "Cluster Settings" - [Documentation] Verifies that a user can set the "Usage Data Collection" flag in "Cluster Settings" + [Documentation] Verifies that a user can set the "Usage Data Collection" flag in "Cluster settings" [Tags] Tier1 ... Sanity ... ODS-1218 diff --git a/ods_ci/tests/Tests/400__ods_dashboard/415__ods_dashboard_projects/415__ods_dashboard_projects_additional.robot b/ods_ci/tests/Tests/400__ods_dashboard/415__ods_dashboard_projects/415__ods_dashboard_projects_additional.robot index 256b79d8a..1997858e0 100644 --- a/ods_ci/tests/Tests/400__ods_dashboard/415__ods_dashboard_projects/415__ods_dashboard_projects_additional.robot +++ b/ods_ci/tests/Tests/400__ods_dashboard/415__ods_dashboard_projects/415__ods_dashboard_projects_additional.robot @@ -35,7 +35,7 @@ ${PV_SIZE}= 1 *** Test Cases *** Verify Notebook Tolerations Are Applied To Workbenches [Documentation] Verifies workbenches get the custom tolerations set by - ... admins in "Cluster Settings" page. It checks 3 scenarios: + ... admins in "Cluster settings" page. It checks 3 scenarios: ... -tolerations changes applied to workbench created after the changes (value from null to A) ... -tolerations change applied to existent workbench, after restart (value from null to A) ... -tolerations change applied to existent workbench, after restart (value from A to A) @@ -286,7 +286,7 @@ Check Limits And Requests For Every Workbench Pod Container END Open Settings And Set Tolerations To - [Documentation] Opens the "Cluster Settings" page in RHODS Dashboard + [Documentation] Opens the "Cluster settings" page in RHODS Dashboard ... and set the tolerations settings to the given one [Arguments] ${tolerations_text} Open Dashboard Settings settings_page=Cluster settings @@ -294,7 +294,7 @@ Open Settings And Set Tolerations To Save Changes In Cluster Settings Open Settings And Disable Tolerations - [Documentation] Opens the "Cluster Settings" page in RHODS Dashboard + [Documentation] Opens the "Cluster settings" page in RHODS Dashboard ... and disable the tolerations settings. ... Before disabling the setting, it restores the default value Open Dashboard Settings settings_page=Cluster settings diff --git a/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/420__model_serving.robot b/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/420__model_serving.robot index 9eb901fce..60209bc39 100644 --- a/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/420__model_serving.robot +++ b/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/420__model_serving.robot @@ -199,7 +199,7 @@ Clean Up DSP Page END Delete Data Science Projects From CLI ${projects} Reload Page - Wait Until Page Contains Data science projects + Wait Until Page Contains Data Science Projects END Try Opening Create Server diff --git a/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/421__model_serving_gpu.robot b/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/421__model_serving_gpu.robot index 51e0ff4cb..951e388ca 100644 --- a/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/421__model_serving_gpu.robot +++ b/ods_ci/tests/Tests/400__ods_dashboard/420__model_serving/421__model_serving_gpu.robot @@ -114,7 +114,7 @@ Clean Up DSP Page END Delete Data Science Projects From CLI ${projects} Reload Page - Wait Until Page Contains Data science projects + Wait Until Page Contains Data Science Projects END Try Opening Create Server