slapos_jio_ui_test: wait for activities.

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSNetwork.zpt

@@ -89,11 +89,6 @@
   <td>//button[@type="submit" and text()="Data Updated"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>pause</td>
-  <td>5000</td>
-  <td>5000</td>
-</tr>
 <!-- check site -->
 
 <!--  Broken history to return
@@ -103,6 +98,8 @@
   <td></td>
 </tr>
 -->
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
+
 <tr>
   <td>click</td>
   <td>//a[@data-i18n="Networks"]</td>
@@ -168,6 +165,8 @@
   <td>//button[@type="submit" and text()="Network is Deleted."]</td>
   <td></td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
+
 <tr>
   <td>waitForElementPresent</td>
   <td>//span[@data-i18n="No records"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSProject.zpt

@@ -89,11 +89,6 @@
   <td>//button[@type="submit" and text()="Data Updated"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>pause</td>
-  <td>5000</td>
-  <td>5000</td>
-</tr>
 <!-- check site -->
 
 <!--  Broken history to return
@@ -103,6 +98,7 @@
   <td></td>
 </tr>
 -->
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
 <tr>
   <td>click</td>
   <td>//a[@data-i18n="Projects"]</td>
@@ -168,6 +164,8 @@
   <td>//button[@type="submit" and text()="Project is Deleted."]</td>
   <td></td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
+
 <tr>
   <td>waitForElementPresent</td>
   <td>//span[@data-i18n="No records"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt

@@ -97,20 +97,8 @@
   <td>//a[@data-i18n="Computer: TEST-SLAPOSJS-COMPUTER 0"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>pause</td>
-  <td>5000</td>
-  <td>5000</td>
-</tr>
-<!-- check site -->
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
 
-<!--  Broken history to return
-<tr>
-  <td>click</td>
-  <td>//a[@data-i18n="Site : TEST-SLAPOSJS-SET 0"]</td>
-  <td></td>
-</tr>
--->
 <tr>
   <td>click</td>
   <td>//a[@data-i18n="Servers" and @accesskey="c"]</td>
@@ -507,11 +495,8 @@
   <td>//h1[@data-i18n='Servers']</td>
   <td></td>
 </tr>
-<tr>
-  <td>pause</td>
-	<td>5000</td>
- 	<td>5000</td>
-</tr>
+  <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
+
 <tr>
   <td>click</td>
   <td>//th/a[text()="Title"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSService.zpt

@@ -118,11 +118,8 @@
   <td>//button[@type="submit" and text()="New service created."]</td>
   <td></td>
 </tr>
-<tr>
-  <td>pause</td>
-  <td>5000</td>
-  <td>5000</td>
-</tr>
+
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
 
 <tr>
   <td>click</td>
@@ -194,6 +191,7 @@
   <td>//button[@type="submit" and text()="Service is Destroyed."]</td>
   <td></td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
 <tr>
   <td>waitForElementPresent</td>
   <td>//span[@data-i18n="No records"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSSite.zpt

@@ -99,12 +99,9 @@
   <td>//div[@class="leaflet-popup-content"]/div/a[text()="TEST-SLAPOSJS-SET 0"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>pause</td>
-  <td>5000</td>
-  <td>5000</td>
-</tr>
-<!-- check site -->
+
+
+  <!-- check site -->
 
 <!--  Broken history to return
 <tr>
@@ -113,6 +110,8 @@
   <td></td>
 </tr>
 -->
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
+
 <tr>
   <td>click</td>
   <td>//a[@data-i18n="Sites"]</td>

master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTicket.zpt

@@ -87,11 +87,9 @@
   <td>//button[@type="submit" and @data-i18n="Save"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>pause</td>
-  <td>5000</td>
-  <td>5000</td>
-</tr>
+
+<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
+
 <tr>
   <td>click</td>
   <td>//a[@data-i18n="Tickets"]</td>

master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt

@@ -110,6 +110,23 @@
     </tr>
   </tal:block>
 
+  <tal:block metal:define-macro="slapos_wait_for_activities_and_front_page">
+
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
+
+    <tr>
+      <td>assertTextPresent</td>
+      <td>Done.</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>open</td>
+      <td>${base_url}/web_site_module/hostingjs/</td>
+      <td></td>
+    </tr>
+    <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_front_page" />
+  </tal:block>
+
   <tal:block metal:define-macro="slapos_wait_for_front_page">
     <!-- Dashboard -->
     <tr>
@@ -133,11 +150,6 @@
       <td>//a[@class='leaflet-control-zoom-out']</td>
       <td></td>
     </tr>
-    <tr>
-      <td>pause</td>
-      <td>5000</td>
-      <td>5000</td>
-    </tr>
   </tal:block>
 
   <tal:block metal:define-macro="slapos_logout">
@@ -171,4 +183,24 @@
     </tr>
   </tal:block>
 
+  <tal:block metal:define-macro="wait_for_content_loaded">
+    <tr>
+      <td colspan="3"><b>Wait for the content to be loaded</b></td>
+    </tr>
+    <tr>
+      <td>waitForElementPresent</td>
+      <td>//div[contains(@data-gadget-url, 'gadget_erp5_header.html')]//h1[@class="ui-title"]//*[contains(@class, "ui-icon-spinner")]</td>
+      <td></td>
+    </tr>
+
+    <tr>
+      <td>waitForElementNotPresent</td>
+      <td>//div[contains(@data-gadget-url, 'gadget_erp5_header.html')]//h1[@class="ui-title"]//*[contains(@class, "ui-icon-spinner")]</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td colspan="3"><p></p></td>
+    </tr>
+  </tal:block>
+
 </tal:block>
\ No newline at end of file