From e951ceb31ceb0b0aa1c2e1246403ee55e80ab842 Mon Sep 17 00:00:00 2001
From: Yogi_Wang <yawang@vmware.com>
Date: Tue, 12 Nov 2019 18:47:15 +0800
Subject: [PATCH] Modify scan now nightly case Signed-off-by: Yogi_Wang
 <yawang@vmware.com>

---
 .../config/vulnerability/vulnerability-config.component.html   | 2 +-
 tests/resources/Harbor-Pages/Vulnerability.robot               | 3 ++-
 tests/resources/Harbor-Pages/Vulnerability_Elements.robot      | 1 +
 tests/robot-cases/Group1-Nightly/Clair.robot                   | 2 +-
 tests/robot-cases/Group1-Nightly/Nightly.robot                 | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html b/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html
index 11c864722..c6474c3d9 100644
--- a/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html
+++ b/src/portal/lib/src/config/vulnerability/vulnerability-config.component.html
@@ -22,7 +22,7 @@
             <span>{{ 'SCANNER.TOTAL' | translate }}</span>
             <span class="margin-left-5">{{scanningMetrics?.total}}</span>
         </div>
-        <div class="container" [style.width]="totalWidth+'px'">
+        <div class="container" id="scan-result-container" [style.width]="totalWidth+'px'">
             <div class="error h-100" [style.width]="errorWidth()"></div>
             <div class="finished h-100" [style.width]="finishedWidth()"></div>
             <div class="in-progress h-100" [style.width]="runningWidth()"></div>
diff --git a/tests/resources/Harbor-Pages/Vulnerability.robot b/tests/resources/Harbor-Pages/Vulnerability.robot
index 2032ea020..6fc9f2231 100644
--- a/tests/resources/Harbor-Pages/Vulnerability.robot
+++ b/tests/resources/Harbor-Pages/Vulnerability.robot
@@ -11,9 +11,10 @@ Disable Scan Schedule
     Retry Element Click  ${vulnerability_dropdown_list_item_none}
     Retry Double Keywords When Error  Retry Element Click  ${vulnerability_save_btn}  Retry Wait Until Page Not Contains Element  ${vulnerability_save_btn}
 
-Trigger Scan Now
+Trigger Scan Now And Wait Until The Result Appears
     Retry Element Click  xpath=${scan_now_button}
     Sleep  10
+    Retry Wait Until Page Contains Element  ${scan_now_result}
 
 Switch To Vulnerability Page
     Retry Element Click  xpath=//clr-main-container//clr-vertical-nav//a[contains(.,'Interrogation')]
diff --git a/tests/resources/Harbor-Pages/Vulnerability_Elements.robot b/tests/resources/Harbor-Pages/Vulnerability_Elements.robot
index 308d9e0c8..613a56567 100644
--- a/tests/resources/Harbor-Pages/Vulnerability_Elements.robot
+++ b/tests/resources/Harbor-Pages/Vulnerability_Elements.robot
@@ -27,5 +27,6 @@ ${scanner_action_xpath}  //span[@id='action-scanner']
 ${delete_scanner_action_xpath}  //span[@id='delete-scanner-action']
 ${immutable_msg_xpath}  //span[contains(.,'registration Clair is not allowed to delete as it is immutable: scanner API: delete')]
 ${delete_scanner_confirm_btn}  xpath=//clr-modal//button[contains(.,'DELETE')]
+${scan_now_result}  xpath=//div[@id="scan-result-container"]
 
 
diff --git a/tests/robot-cases/Group1-Nightly/Clair.robot b/tests/robot-cases/Group1-Nightly/Clair.robot
index 20a4027a8..ad2aa7f5f 100644
--- a/tests/robot-cases/Group1-Nightly/Clair.robot
+++ b/tests/robot-cases/Group1-Nightly/Clair.robot
@@ -72,7 +72,7 @@ Test Case - Manual Scan All
     Push Image  ${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}  library  redis
     Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
     Switch To Vulnerability Page
-    Trigger Scan Now
+    Trigger Scan Now And Wait Until The Result Appears
     Navigate To Projects
     Go Into Project  library
     Go Into Repo  redis
diff --git a/tests/robot-cases/Group1-Nightly/Nightly.robot b/tests/robot-cases/Group1-Nightly/Nightly.robot
index 1e02d7ce6..8648101a7 100644
--- a/tests/robot-cases/Group1-Nightly/Nightly.robot
+++ b/tests/robot-cases/Group1-Nightly/Nightly.robot
@@ -447,7 +447,7 @@ Test Case - Manual Scan All
     Push Image  ${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}  library  redis
     Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
     Switch To Vulnerability Page
-    Trigger Scan Now
+    Trigger Scan Now And Wait Until The Result Appears
     Navigate To Projects
     Go Into Project  library
     Go Into Repo  redis