From 8d129604949c60083a0667286ad0389ce3f7dc4b Mon Sep 17 00:00:00 2001
From: sigsbee <23101283+sigsbee@users.noreply.github.com>
Date: Thu, 24 May 2018 19:53:23 +0800
Subject: [PATCH] Fix robot keywords align with UI changes (#5036)

Fix robot keywords align with UI changes
fix replication case for new delete progress
---
 tests/resources/Harbor-Pages/Configuration.robot    |  2 +-
 tests/resources/Harbor-Pages/Project-Members.robot  |  2 --
 tests/resources/Harbor-Pages/Replication.robot      | 10 +++-------
 tests/resources/Harbor-Pages/ToolKit.robot          |  2 +-
 tests/robot-cases/Group11-Nightly/Replication.robot |  4 ++--
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/tests/resources/Harbor-Pages/Configuration.robot b/tests/resources/Harbor-Pages/Configuration.robot
index b0ec98489..989115bf5 100644
--- a/tests/resources/Harbor-Pages/Configuration.robot
+++ b/tests/resources/Harbor-Pages/Configuration.robot
@@ -275,4 +275,4 @@ Delete A Label
     Sleep  3
     Capture Page Screenshot
     Click Element  xpath=//clr-modal//div//button[contains(.,'DELETE')]
-    Wait Until Page Contains Element  //clr-tab-content//div[contains(.,'${labelname}')]/../div/clr-icon[@shape="success-standard"
+    Wait Until Page Contains Element  //clr-tab-content//div[contains(.,'${labelname}')]/../div/clr-icon[@shape="success-standard"]
diff --git a/tests/resources/Harbor-Pages/Project-Members.robot b/tests/resources/Harbor-Pages/Project-Members.robot
index ad51da4a2..5c9ce1b2f 100644
--- a/tests/resources/Harbor-Pages/Project-Members.robot
+++ b/tests/resources/Harbor-Pages/Project-Members.robot
@@ -110,8 +110,6 @@ Delete Project Member
     Sleep  2
     Click Element  xpath=//button[contains(.,'DELETE')]
     Sleep  2
-    Click Element  xpath=//button[contains(.,'CLOSE')]
-    Sleep  1
 
 User Should Be Owner Of Project
     [Arguments]  ${user}  ${pwd}  ${project}
diff --git a/tests/resources/Harbor-Pages/Replication.robot b/tests/resources/Harbor-Pages/Replication.robot
index da6769efc..880e84af1 100644
--- a/tests/resources/Harbor-Pages/Replication.robot
+++ b/tests/resources/Harbor-Pages/Replication.robot
@@ -143,8 +143,9 @@ Trigger Replication Manual
     Click Element  ${action_bar_replicate}
     Wait Until Page Contains Element  ${dialog_replicate}
     Click Element  ${dialog_replicate}
-    Wait Until Page Contains  successfully
-    Click Element  ${dialog_close}
+    Sleep  2
+    Page Should Contain Element  //clr-tab-content//div[contains(.,'${rule}')]/../div/clr-icon[@shape="success-standard"]
+    Sleep  1
 
 Rename Rule
     [Arguments]  ${rule}  ${newname}
@@ -165,9 +166,7 @@ Delete Rule
     Click Element  ${action_bar_delete}
     Wait Until Page Contains Element  ${dialog_delete}
     Click Element  ${dialog_delete}
-    Wait Until Page Contains Element  ${dialog_close}
     Sleep  2
-    Click Element  ${dialog_close}
 
 Filter Rule
     [Arguments]  ${rule} 
@@ -212,6 +211,3 @@ Delete Endpoint
     Click Element  ${action_bar_delete}
     Wait Until Page Contains Element  ${dialog_delete}
     Click Element  ${dialog_delete}
-    Wait Until Page Contains  success
-    Click Element  ${dialog_close}
-
diff --git a/tests/resources/Harbor-Pages/ToolKit.robot b/tests/resources/Harbor-Pages/ToolKit.robot
index c7164c11f..f26643dcc 100644
--- a/tests/resources/Harbor-Pages/ToolKit.robot
+++ b/tests/resources/Harbor-Pages/ToolKit.robot
@@ -22,7 +22,7 @@ ${HARBOR_VERSION}  v1.1.1
 *** Keywords ***
 Delete Success
     [Arguments]  @{obj}
-    :For ${obj} in  @{obj}
+    :For  ${obj}  in  @{obj}
     \    Page Should Contain Element  //clr-tab-content//div[contains(.,'${obj}')]/../div/clr-icon[@shape="success-standard"]
     Sleep  1
 
diff --git a/tests/robot-cases/Group11-Nightly/Replication.robot b/tests/robot-cases/Group11-Nightly/Replication.robot
index 904505320..7180248aa 100644
--- a/tests/robot-cases/Group11-Nightly/Replication.robot
+++ b/tests/robot-cases/Group11-Nightly/Replication.robot
@@ -68,7 +68,7 @@ Test Case - Endpoint Delete
     Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
     Switch To Registries
     Delete Endpoint  deletea
-    Wait Until Page Does Not Contain  deletea
+    Delete Success  deletea
     Close Browser
    
 Test Case - Rule Edit
@@ -90,7 +90,7 @@ Test Case - Rule Delete
     Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
     Switch To Replication Manage
     Delete Rule  newname
-    Wait Until Page Does Not Contain  newname
+    Delete Success  newname
     Close Browser