Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 18:55:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10517 from danfengliu/click-out-infomation-popup-frame

Browse Source 
Close scan plugin popup message to avoid interfereing logout operation
This commit is contained in:
danfengliu 2020-04-03 12:32:44 +08:00 committed by GitHub
commit fdbd59daf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/apitests/python/test_scan_all_images.py
View File

@ -77,14 +77,14 @@ class TestProjects(unittest.TestCase):
#Note: Please make sure that this Image has never been pulled before by any other cases, #Note: Please make sure that this Image has never been pulled before by any other cases,
# so it is a not-scanned image rigth after repository creation. # so it is a not-scanned image rigth after repository creation.
#image = "tomcat" #image = "tomcat"
image = "mariadb" image = "haproxy"
src_tag = "latest" src_tag = "latest"
#3.1 Push a image to project_Alice; #3.1 Push a image to project_Alice;
TestProjects.repo_Alice_name, tag_Alice = push_image_to_project(project_Alice_name, harbor_server, user_Alice_name, user_common_password, image, src_tag) TestProjects.repo_Alice_name, tag_Alice = push_image_to_project(project_Alice_name, harbor_server, user_Alice_name, user_common_password, image, src_tag)
#Note: Please make sure that this Image has never been pulled before by any other cases, #Note: Please make sure that this Image has never been pulled before by any other cases,
# so it is a not-scanned image rigth after repository creation. # so it is a not-scanned image rigth after repository creation.
image = "mysql" image = "memcached"
src_tag = "latest" src_tag = "latest"
#3.2 push another image to project_Luca; #3.2 push another image to project_Luca;
TestProjects.repo_Luca_name, tag_Luca = push_image_to_project(project_Luca_name, harbor_server, user_Luca_name, user_common_password, image, src_tag) TestProjects.repo_Luca_name, tag_Luca = push_image_to_project(project_Luca_name, harbor_server, user_Luca_name, user_common_password, image, src_tag)

3
tests/resources/Harbor-Pages/HomePage.robot
View File

@ -31,7 +31,8 @@ Sign In Harbor
Retry Button Click ${login_btn} Retry Button Click ${login_btn}
Log To Console ${user} Log To Console ${user}
Retry Wait Element xpath=//span[contains(., '${user}')] Retry Wait Element xpath=//span[contains(., '${user}')]
Run Keyword If ${is_close_scan_plugin_mesg}==${true} Run Keyword And Ignore Error Retry Element Click ${close_scan_plugin_mesg} Click Element If Visible ${close_scan_plugin_mesg}
#Run Keyword If ${is_close_scan_plugin_mesg}==${true} Run Keyword And Ignore Error Retry Element Click ${close_scan_plugin_mesg}
Capture Screenshot And Source Capture Screenshot And Source
Capture Page Screenshot Capture Page Screenshot

1
tests/resources/Harbor-Pages/Project.robot
View File

@ -205,6 +205,7 @@ Go Into Repo
\ Sleep 2 \ Sleep 2
Capture Page Screenshot Capture Page Screenshot
Retry Double Keywords When Error Retry Element Click ${repo_name_element} Retry Wait Until Page Not Contains Element ${repo_name_element} Retry Double Keywords When Error Retry Element Click ${repo_name_element} Retry Wait Until Page Not Contains Element ${repo_name_element}
Capture Page Screenshot
Retry Wait Element ${tag_table_column_pull_command} Retry Wait Element ${tag_table_column_pull_command}
Retry Wait Element ${tag_images_btn} Retry Wait Element ${tag_images_btn}
Capture Page Screenshot Capture Page Screenshot

2
tests/resources/Harbor-Pages/ToolKit.robot
View File

@ -74,6 +74,7 @@ Multi-delete Object
Multi-delete User Multi-delete User
[Arguments] @{obj} [Arguments] @{obj}
:For ${obj} in @{obj} :For ${obj} in @{obj}
\ Sleep 1
\ Retry Element Click //clr-dg-row[contains(.,'${obj}')]//label \ Retry Element Click //clr-dg-row[contains(.,'${obj}')]//label
Retry Element Click ${member_action_xpath} Retry Element Click ${member_action_xpath}
Retry Element Click //*[@id='deleteUser'] Retry Element Click //*[@id='deleteUser']
@ -83,6 +84,7 @@ Multi-delete User
Multi-delete Member Multi-delete Member
[Arguments] @{obj} [Arguments] @{obj}
:For ${obj} in @{obj} :For ${obj} in @{obj}
\ Sleep 1
\ Retry Element Click //clr-dg-row[contains(.,'${obj}')]//clr-checkbox-wrapper/label \ Retry Element Click //clr-dg-row[contains(.,'${obj}')]//clr-checkbox-wrapper/label
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 ${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} Retry Double Keywords When Error Retry Element Click ${delete_action_xpath} Retry Wait Until Page Contains Element ${delete_btn}

8
tests/resources/Util.robot
View File

@ -223,6 +223,14 @@ Command Should be Failed
Should Not Be Equal As Strings '${rc}' '0' Should Not Be Equal As Strings '${rc}' '0'
[Return] ${output} [Return] ${output}
Click Element If Visible
[Arguments] ${elements}
:For ${n} IN RANGE 1 6
\ ${out} Run Keyword And Ignore Error Wait Until Page Contains Element ${elements}
\ Exit For Loop If '${out[0]}'=='FAIL'
\ Retry Element Click ${elements}
Should Be Equal As Strings '${out[0]}' 'FAIL'
Retry Keyword When Error Retry Keyword When Error
[Arguments] ${keyword} @{elements} [Arguments] ${keyword} @{elements}
:For ${n} IN RANGE 1 6 :For ${n} IN RANGE 1 6