From be3f499b9b06a87d3ba6a73a0ab5632a6c78dd11 Mon Sep 17 00:00:00 2001 From: Will Sun <30999793+AllForNothing@users.noreply.github.com> Date: Fri, 18 Jun 2021 17:53:26 +0800 Subject: [PATCH] Fix nightly failure (#15161) Signed-off-by: AllForNothing --- tests/resources/Harbor-Pages/Configuration.robot | 6 +++--- tests/resources/Harbor-Pages/Project-Artifact.robot | 2 +- .../Harbor-Pages/Project-Helmcharts_Elements.robot | 2 +- tests/resources/Harbor-Pages/Project-Members.robot | 2 +- .../Harbor-Pages/Project-Tag-Retention_Elements.robot | 2 +- tests/resources/Harbor-Pages/Project-Webhooks.robot | 10 +++++----- tests/resources/Harbor-Pages/Project.robot | 4 ++-- tests/resources/Harbor-Pages/Project_Elements.robot | 2 +- tests/resources/Harbor-Pages/Replication.robot | 2 +- .../resources/Harbor-Pages/Replication_Elements.robot | 2 +- tests/resources/Harbor-Pages/Robot_Account.robot | 2 +- .../Harbor-Pages/Robot_Account_Elements.robot | 4 ++-- tests/resources/Harbor-Pages/ToolKit.robot | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/resources/Harbor-Pages/Configuration.robot b/tests/resources/Harbor-Pages/Configuration.robot index 75d990f2e..1170c69d2 100644 --- a/tests/resources/Harbor-Pages/Configuration.robot +++ b/tests/resources/Harbor-Pages/Configuration.robot @@ -276,7 +276,7 @@ Create New Labels Update A Label [Arguments] ${labelname} - Retry Element Click xpath=//clr-dg-row[contains(.,'${labelname}')]//clr-checkbox-wrapper + Retry Element Click xpath=//clr-dg-row[contains(.,'${labelname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label Sleep 1 Retry Element Click xpath=//button[contains(.,'Edit')] Sleep 1 @@ -287,7 +287,7 @@ Update A Label Delete A Label [Arguments] ${labelname} - Retry Element Click xpath=//clr-dg-row[contains(.,'${labelname}')]//clr-checkbox-wrapper + Retry Element Click xpath=//clr-dg-row[contains(.,'${labelname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label Sleep 1 Retry Element Click xpath=//button[contains(.,'Delete')] Sleep 3 @@ -367,7 +367,7 @@ Set User Name Claim And Save Select Distribution [Arguments] ${name} - Retry Element Click //clr-dg-row[contains(.,'${name}')]//clr-checkbox-wrapper/label + Retry Element Click //clr-dg-row[contains(.,'${name}')]//div[contains(@class,'clr-checkbox-wrapper')]/label Distribution Exist [Arguments] ${name} ${endpoint} diff --git a/tests/resources/Harbor-Pages/Project-Artifact.robot b/tests/resources/Harbor-Pages/Project-Artifact.robot index 85aef33fb..86fd7acb7 100644 --- a/tests/resources/Harbor-Pages/Project-Artifact.robot +++ b/tests/resources/Harbor-Pages/Project-Artifact.robot @@ -40,7 +40,7 @@ Add A New Tag Delete A Tag [Arguments] ${tag} - Retry Element Click xpath=//clr-dg-row[contains(.,'${tag}')]//clr-checkbox-wrapper//label[contains(@class,'clr-control-label')] + Retry Element Click xpath=//clr-dg-row[contains(.,'${tag}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')] Retry Double Keywords When Error Retry Element Click ${delete_tag_button} Retry Wait Until Page Contains Element ${dialog_delete_button} Retry Double Keywords When Error Retry Element Click ${dialog_delete_button} Should Not Contain Tag ${tag} diff --git a/tests/resources/Harbor-Pages/Project-Helmcharts_Elements.robot b/tests/resources/Harbor-Pages/Project-Helmcharts_Elements.robot index f0ec3ec9a..fc3625558 100644 --- a/tests/resources/Harbor-Pages/Project-Helmcharts_Elements.robot +++ b/tests/resources/Harbor-Pages/Project-Helmcharts_Elements.robot @@ -31,7 +31,7 @@ ${detail_value} //*[@id='value-link'] ${value_content} //*[@id='value-content']/hbr-chart-detail-value ${version_bread_crumbs} //project-chart-detail//a[contains(.,'Versions')] -${version_checkbox} //clr-dg-row//clr-checkbox-wrapper/label +${version_checkbox} //clr-dg-row//div[contains(@class,'clr-checkbox-wrapper')]/label ${version_delete} //clr-dg-action-bar/button[contains(.,'DELETE')] ${version_confirm_delete} //clr-modal//button[contains(.,'DELETE')] diff --git a/tests/resources/Harbor-Pages/Project-Members.robot b/tests/resources/Harbor-Pages/Project-Members.robot index 8b3725524..53f09fa55 100644 --- a/tests/resources/Harbor-Pages/Project-Members.robot +++ b/tests/resources/Harbor-Pages/Project-Members.robot @@ -69,7 +69,7 @@ Change Project Member Role Change Member Role [Arguments] ${user} ${role} Retry Element Click xpath=${project_member_tag_xpath} - Retry Element Click xpath=//project-detail//clr-dg-row[contains(.,'${user}')]//clr-checkbox-wrapper + Retry Element Click xpath=//project-detail//clr-dg-row[contains(.,'${user}')]//div[contains(@class,'clr-checkbox-wrapper')] #change role Retry Element Click ${project_member_action_xpath} Retry Element Click //button[contains(.,'${role}')] diff --git a/tests/resources/Harbor-Pages/Project-Tag-Retention_Elements.robot b/tests/resources/Harbor-Pages/Project-Tag-Retention_Elements.robot index bdf8597a1..d0ac19b12 100644 --- a/tests/resources/Harbor-Pages/Project-Tag-Retention_Elements.robot +++ b/tests/resources/Harbor-Pages/Project-Tag-Retention_Elements.robot @@ -33,7 +33,7 @@ ${project_tag_retention_span_daily_xpath} //cron-selection//div//span[contains( ${project_tag_retention_dry_run_xpath} //*[@id='dry-run'] ${project_tag_retention_refresh_xpath} //clr-dg-action-bar/button[4] ${project_tag_retention_record_yes_xpath} //clr-datagrid[contains(.,'Yes')] -${project_tag_retention_list_expand_icon_xpath} //project-detail/app-tag-feature-integration/tag-retention//clr-datagrid//clr-dg-row//clr-expandable-animation//clr-icon[@class='datagrid-expandable-caret-icon'] +${project_tag_retention_list_expand_icon_xpath} //project-detail/app-tag-feature-integration/tag-retention//clr-datagrid//clr-dg-row//clr-expandable-animation//cds-icon[@class='datagrid-expandable-caret-icon'] ${project_tag_retention_run_now_xpath} //*[@id='run-now'] ${project_tag_retention_execute_run_xpath} //*[@id='execute-run'] ${project_tag_retention_record_no_xpath} //clr-datagrid[contains(.,'No')] diff --git a/tests/resources/Harbor-Pages/Project-Webhooks.robot b/tests/resources/Harbor-Pages/Project-Webhooks.robot index 614c100f5..c226e25b0 100644 --- a/tests/resources/Harbor-Pages/Project-Webhooks.robot +++ b/tests/resources/Harbor-Pages/Project-Webhooks.robot @@ -21,7 +21,7 @@ Create A New Webhook Update A Webhook [Arguments] ${old_webhook_name} ${new_webhook_name} ${new_webhook_enpoint} # select one webhook - Retry Element Click xpath=//clr-dg-row[contains(.,'${old_webhook_name}')]//clr-checkbox-wrapper//label[contains(@class,'clr-control-label')] + Retry Element Click xpath=//clr-dg-row[contains(.,'${old_webhook_name}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')] Retry Element Click ${action_webhook_xpath} Retry Element Click ${action_webhook_edit_button} @@ -37,7 +37,7 @@ Update A Webhook Enable/Disable State of Same Webhook [Arguments] ${webhook_name} - Retry Element Click xpath=//clr-dg-row[contains(.,'${webhook_name}')]//clr-checkbox-wrapper//label[contains(@class,'clr-control-label')] + Retry Element Click xpath=//clr-dg-row[contains(.,'${webhook_name}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')] Retry Element Click ${action_webhook_xpath} Retry Element Click ${action_webhook_disable_or_enable_button} Retry Wait Until Page Contains Element ${dialog_disable_id_xpath} @@ -45,7 +45,7 @@ Enable/Disable State of Same Webhook # contain disabled webhook Retry Wait Until Page Contains Element xpath=//clr-dg-row[contains(.,'${webhook_name}')]//span[contains(.,'Disabled')] - Retry Element Click xpath=//clr-dg-row[contains(.,'${webhook_name}')]//clr-checkbox-wrapper//label[contains(@class,'clr-control-label')] + Retry Element Click xpath=//clr-dg-row[contains(.,'${webhook_name}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')] Retry Element Click ${action_webhook_xpath} Retry Element Click ${action_webhook_disable_or_enable_button} Retry Wait Until Page Contains Element ${dialog_enable_id_xpath} @@ -55,9 +55,9 @@ Enable/Disable State of Same Webhook Delete A Webhook [Arguments] ${webhook_name} - Retry Element Click xpath=//clr-dg-row[contains(.,'${webhook_name}')]//clr-checkbox-wrapper//label[contains(@class,'clr-control-label')] + Retry Element Click xpath=//clr-dg-row[contains(.,'${webhook_name}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')] Retry Element Click ${action_webhook_xpath} Retry Element Click ${action_webhook_delete_button} Retry Wait Until Page Contains Element ${dialog_delete_button} Retry Element Click ${dialog_delete_button} - Retry Wait Until Page Not Contains Element xpath=//clr-dg-row[contains(.,'${webhook_name}')]//clr-checkbox-wrapper//label[contains(@class,'clr-control-label')] + Retry Wait Until Page Not Contains Element xpath=//clr-dg-row[contains(.,'${webhook_name}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')] diff --git a/tests/resources/Harbor-Pages/Project.robot b/tests/resources/Harbor-Pages/Project.robot index a3e0c4f9e..9def41299 100644 --- a/tests/resources/Harbor-Pages/Project.robot +++ b/tests/resources/Harbor-Pages/Project.robot @@ -147,7 +147,7 @@ Filter Repo Delete Repo [Arguments] ${pro_name} ${repo_name} - ${element_repo_checkbox}= Set Variable xpath=//clr-dg-row[contains(.,'${pro_name}/${repo_name}')]//clr-checkbox-wrapper//label + ${element_repo_checkbox}= Set Variable xpath=//clr-dg-row[contains(.,'${pro_name}/${repo_name}')]//div[contains(@class,'clr-checkbox-wrapper')]//label Filter Repo ${pro_name} ${repo_name} Retry Double Keywords When Error Retry Element Click ${element_repo_checkbox} Wait Until Element Is Visible And Enabled ${repo_delete_btn} Retry Double Keywords When Error Retry Element Click ${repo_delete_btn} Wait Until Element Is Visible And Enabled ${delete_confirm_btn} @@ -165,7 +165,7 @@ Delete Repo on CardView Delete Project [Arguments] ${projectname} Navigate To Projects - Retry Element Click xpath=//clr-dg-row[contains(.,'${projectname}')]//clr-checkbox-wrapper//label + Retry Element Click xpath=//clr-dg-row[contains(.,'${projectname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label Retry Element Click xpath=//*[@id='delete-project'] Retry Element Click //clr-modal//button[contains(.,'DELETE')] Sleep 1 diff --git a/tests/resources/Harbor-Pages/Project_Elements.robot b/tests/resources/Harbor-Pages/Project_Elements.robot index 336064a76..dbf57ea31 100644 --- a/tests/resources/Harbor-Pages/Project_Elements.robot +++ b/tests/resources/Harbor-Pages/Project_Elements.robot @@ -49,7 +49,7 @@ ${repo_search_input} xpath=//hbr-filter//input ${repo_list_spinner} xpath=//clr-datagrid//clr-spinner #${repo_search_icon} xpath=//hbr-repository-gridview//clr-datagrid//clr-dg-column[contains(.,'Name')]//clr-dg-string-filter//button//clr-icon #${repo_search_input} xpath=//div[@class[contains(.,'datagrid-filter')]]//input -${repo_tag_1st_checkbox} xpath=//clr-datagrid//clr-dg-row//clr-checkbox-wrapper +${repo_tag_1st_checkbox} xpath=//clr-datagrid//clr-dg-row//div[contains(@class,'clr-checkbox-wrapper')] ${tag_table_column_pull_command} xpath=//clr-dg-column//span[contains(.,'Pull Command')] ${tag_table_column_vulnerabilities} xpath=//clr-dg-column//span[contains(.,'Vulnerabilities')] ${tag_table_column_os_arch} xpath=//clr-dg-column//span[contains(.,'OS/ARCH')] diff --git a/tests/resources/Harbor-Pages/Replication.robot b/tests/resources/Harbor-Pages/Replication.robot index 65336d9fb..fc5192213 100644 --- a/tests/resources/Harbor-Pages/Replication.robot +++ b/tests/resources/Harbor-Pages/Replication.robot @@ -224,7 +224,7 @@ Delete Endpoint Retry Element Click ${endpoint_filter_search} Retry Text Input ${endpoint_filter_input} ${name} #click checkbox before target endpoint - Retry Double Keywords When Error Retry Element Click //clr-dg-row[contains(.,'${name}')]//clr-checkbox-wrapper Retry Wait Element ${registry_del_btn} + Retry Double Keywords When Error Retry Element Click //clr-dg-row[contains(.,'${name}')]//div[contains(@class,'clr-checkbox-wrapper')] Retry Wait Element ${registry_del_btn} Retry Element Click ${registry_del_btn} Wait Until Page Contains Element ${dialog_delete} Retry Element Click ${dialog_delete} diff --git a/tests/resources/Harbor-Pages/Replication_Elements.robot b/tests/resources/Harbor-Pages/Replication_Elements.robot index d914f2fdb..7904f022e 100644 --- a/tests/resources/Harbor-Pages/Replication_Elements.robot +++ b/tests/resources/Harbor-Pages/Replication_Elements.robot @@ -75,7 +75,7 @@ ${replication_rule_action} //*[@id='rule-action'] ${replication_rule_action_bar_edit} //*[@id='edit_replication_rule_id'] ${replication_rule_action_bar_delete} //*[@id='delete_replication_rule_id'] ${replication_rule_exec_id} //*[@id='replication_exe_id'] -${replication_task_line_1} //clr-datagrid//clr-dg-row/div/div[2]//clr-checkbox-wrapper/label[1] +${replication_task_line_1} //clr-datagrid//clr-dg-row/div/div[2]//div[contains(@class,'clr-checkbox-wrapper')]/label[1] ${is_overide_xpath} //label[contains(.,'Replace the destination resources if name exists')] ${enable_rule_xpath} //label[contains(.,'Enable rule')] ${targetCron_id} //*[@id='targetCron'] diff --git a/tests/resources/Harbor-Pages/Robot_Account.robot b/tests/resources/Harbor-Pages/Robot_Account.robot index 4d5b6163b..57132daa4 100644 --- a/tests/resources/Harbor-Pages/Robot_Account.robot +++ b/tests/resources/Harbor-Pages/Robot_Account.robot @@ -107,7 +107,7 @@ Create A New System Robot Account ${permission_item_list}= Get From Dictionary ${tmp} permission_item_list Log To Console permission_item_list: ${permission_item_list} Filter Project In Project Permisstion List ${project_name} - Retry Element Click //clr-dg-row[contains(.,'${project_name}')]//clr-checkbox-wrapper/label + Retry Element Click //clr-dg-row[contains(.,'${project_name}')]//div[contains(@class,'clr-checkbox-wrapper')]/label Retry Element Click //clr-dg-row[contains(., '${project_name}')]//clr-dropdown/button Select Project Permission ${project_name} ${permission_item_list} END diff --git a/tests/resources/Harbor-Pages/Robot_Account_Elements.robot b/tests/resources/Harbor-Pages/Robot_Account_Elements.robot index 7fdca6fb6..e504663d1 100644 --- a/tests/resources/Harbor-Pages/Robot_Account_Elements.robot +++ b/tests/resources/Harbor-Pages/Robot_Account_Elements.robot @@ -25,8 +25,8 @@ ${sys_robot_account_coverall_chb_input} xpath=//input[@id='coverAll'] ${sys_robot_account_coverall_chb} //clr-checkbox-wrapper[contains(@class, 'clr-checkbox-wrapper')]/label[contains(@for, 'coverAll')] ${sys_robot_account_permission_list_btn} //form/section//clr-dropdown/button ${save_sys_robot_account_btn} //*[@id='system-robot-save'] -${save_sys_robot_project_filter_chb} //clr-dg-string-filter/clr-dg-filter//clr-icon +${save_sys_robot_project_filter_chb} //clr-dg-string-filter/clr-dg-filter//cds-icon ${save_sys_robot_project_filter_input} //input[contains(@name, 'search')] -${save_sys_robot_project_filter_close_btn} //button/clr-icon[contains(@title, 'Close')] +${save_sys_robot_project_filter_close_btn} //button/cds-icon[contains(@title, 'Close')] ${save_sys_robot_project_paste_icon} //hbr-copy-input//clr-icon diff --git a/tests/resources/Harbor-Pages/ToolKit.robot b/tests/resources/Harbor-Pages/ToolKit.robot index a3b020e40..b8a6260ae 100644 --- a/tests/resources/Harbor-Pages/ToolKit.robot +++ b/tests/resources/Harbor-Pages/ToolKit.robot @@ -97,7 +97,7 @@ Multi-delete User Multi-delete Member [Arguments] @{obj} FOR ${obj} IN @{obj} - Retry Element Click //clr-dg-row[contains(.,'${obj}')]//clr-checkbox-wrapper/label + Retry Element Click //clr-dg-row[contains(.,'${obj}')]//div[contains(@class,'clr-checkbox-wrapper')]/label END Retry Double Keywords When Error Retry Element Click ${member_action_xpath} Retry Wait Until Page Contains Element ${delete_action_xpath} Retry Double Keywords When Error Retry Element Click ${delete_action_xpath} Retry Wait Until Page Contains Element ${delete_btn}