Commit 14af5289 authored by Rafael Monnerat's avatar Rafael Monnerat

slapos_jio_ui_test: wait for activities.

parent 75b3d3ab
...@@ -89,11 +89,6 @@ ...@@ -89,11 +89,6 @@
<td>//button[@type="submit" and text()="Data Updated"]</td> <td>//button[@type="submit" and text()="Data Updated"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td>5000</td>
</tr>
<!-- check site --> <!-- check site -->
<!-- Broken history to return <!-- Broken history to return
...@@ -103,6 +98,8 @@ ...@@ -103,6 +98,8 @@
<td></td> <td></td>
</tr> </tr>
--> -->
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<tr> <tr>
<td>click</td> <td>click</td>
<td>//a[@data-i18n="Networks"]</td> <td>//a[@data-i18n="Networks"]</td>
...@@ -168,6 +165,8 @@ ...@@ -168,6 +165,8 @@
<td>//button[@type="submit" and text()="Network is Deleted."]</td> <td>//button[@type="submit" and text()="Network is Deleted."]</td>
<td></td> <td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//span[@data-i18n="No records"]</td> <td>//span[@data-i18n="No records"]</td>
......
...@@ -89,11 +89,6 @@ ...@@ -89,11 +89,6 @@
<td>//button[@type="submit" and text()="Data Updated"]</td> <td>//button[@type="submit" and text()="Data Updated"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td>5000</td>
</tr>
<!-- check site --> <!-- check site -->
<!-- Broken history to return <!-- Broken history to return
...@@ -103,6 +98,7 @@ ...@@ -103,6 +98,7 @@
<td></td> <td></td>
</tr> </tr>
--> -->
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<tr> <tr>
<td>click</td> <td>click</td>
<td>//a[@data-i18n="Projects"]</td> <td>//a[@data-i18n="Projects"]</td>
...@@ -168,6 +164,8 @@ ...@@ -168,6 +164,8 @@
<td>//button[@type="submit" and text()="Project is Deleted."]</td> <td>//button[@type="submit" and text()="Project is Deleted."]</td>
<td></td> <td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//span[@data-i18n="No records"]</td> <td>//span[@data-i18n="No records"]</td>
......
...@@ -97,20 +97,8 @@ ...@@ -97,20 +97,8 @@
<td>//a[@data-i18n="Computer: TEST-SLAPOSJS-COMPUTER 0"]</td> <td>//a[@data-i18n="Computer: TEST-SLAPOSJS-COMPUTER 0"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<td>pause</td>
<td>5000</td>
<td>5000</td>
</tr>
<!-- check site -->
<!-- Broken history to return
<tr>
<td>click</td>
<td>//a[@data-i18n="Site : TEST-SLAPOSJS-SET 0"]</td>
<td></td>
</tr>
-->
<tr> <tr>
<td>click</td> <td>click</td>
<td>//a[@data-i18n="Servers" and @accesskey="c"]</td> <td>//a[@data-i18n="Servers" and @accesskey="c"]</td>
...@@ -507,11 +495,8 @@ ...@@ -507,11 +495,8 @@
<td>//h1[@data-i18n='Servers']</td> <td>//h1[@data-i18n='Servers']</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<td>pause</td>
<td>5000</td>
<td>5000</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>//th/a[text()="Title"]</td> <td>//th/a[text()="Title"]</td>
......
...@@ -118,11 +118,8 @@ ...@@ -118,11 +118,8 @@
<td>//button[@type="submit" and text()="New service created."]</td> <td>//button[@type="submit" and text()="New service created."]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td> <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<td>5000</td>
<td>5000</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
...@@ -194,6 +191,7 @@ ...@@ -194,6 +191,7 @@
<td>//button[@type="submit" and text()="Service is Destroyed."]</td> <td>//button[@type="submit" and text()="Service is Destroyed."]</td>
<td></td> <td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//span[@data-i18n="No records"]</td> <td>//span[@data-i18n="No records"]</td>
......
...@@ -99,12 +99,9 @@ ...@@ -99,12 +99,9 @@
<td>//div[@class="leaflet-popup-content"]/div/a[text()="TEST-SLAPOSJS-SET 0"]</td> <td>//div[@class="leaflet-popup-content"]/div/a[text()="TEST-SLAPOSJS-SET 0"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td> <!-- check site -->
<td>5000</td>
</tr>
<!-- check site -->
<!-- Broken history to return <!-- Broken history to return
<tr> <tr>
...@@ -113,6 +110,8 @@ ...@@ -113,6 +110,8 @@
<td></td> <td></td>
</tr> </tr>
--> -->
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<tr> <tr>
<td>click</td> <td>click</td>
<td>//a[@data-i18n="Sites"]</td> <td>//a[@data-i18n="Sites"]</td>
......
...@@ -87,11 +87,9 @@ ...@@ -87,11 +87,9 @@
<td>//button[@type="submit" and @data-i18n="Save"]</td> <td>//button[@type="submit" and @data-i18n="Save"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td> <tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page" />
<td>5000</td>
<td>5000</td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>//a[@data-i18n="Tickets"]</td> <td>//a[@data-i18n="Tickets"]</td>
......
...@@ -110,6 +110,23 @@ ...@@ -110,6 +110,23 @@
</tr> </tr>
</tal:block> </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"> <tal:block metal:define-macro="slapos_wait_for_front_page">
<!-- Dashboard --> <!-- Dashboard -->
<tr> <tr>
...@@ -133,11 +150,6 @@ ...@@ -133,11 +150,6 @@
<td>//a[@class='leaflet-control-zoom-out']</td> <td>//a[@class='leaflet-control-zoom-out']</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>5000</td>
<td>5000</td>
</tr>
</tal:block> </tal:block>
<tal:block metal:define-macro="slapos_logout"> <tal:block metal:define-macro="slapos_logout">
...@@ -171,4 +183,24 @@ ...@@ -171,4 +183,24 @@
</tr> </tr>
</tal:block> </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> </tal:block>
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment