Commit 02b3af85 authored by Boris Kocherov's avatar Boris Kocherov

[erp5_officejs_ui_test] add waiting finish synchronize

parent 7d215e5a
...@@ -79,16 +79,7 @@ ...@@ -79,16 +79,7 @@
<td>//div[@data-gadget-scope="notification"]//button[text()='Data Updated']</td> <td>//div[@data-gadget-scope="notification"]//button[text()='Data Updated']</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/synchronize"/>
<td>click</td>
<td>//a[@data-i18n="Synchronize"]</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[text()='Add']</td>
<td></td>
</tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/portal_skins/erp5_officejs_ui_test/gadget_ooffice_spreadsheet_convert_check.html</td> <td>${base_url}/portal_skins/erp5_officejs_ui_test/gadget_ooffice_spreadsheet_convert_check.html</td>
......
...@@ -39,8 +39,7 @@ ...@@ -39,8 +39,7 @@
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" /> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/synchronize"/> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/synchronize"/>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/open_document_with_title"/> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/open_document_with_title"/>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/wait_for_load_spreadsheet"/> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/wait_for_load_spreadsheet"/>
......
...@@ -115,8 +115,7 @@ ...@@ -115,8 +115,7 @@
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOfficeCell/macros/current_cell" /> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOfficeCell/macros/current_cell" />
</tal:block--> </tal:block-->
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/synchronize"/> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/synchronize"/>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/>
<!-- XXX Romain --> <!-- XXX Romain -->
<!--tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/open_document_with_title"/> <!--tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/open_document_with_title"/>
......
...@@ -185,11 +185,7 @@ ...@@ -185,11 +185,7 @@
<td>description</td> <td>description</td>
<td>${description}</td> <td>${description}</td>
</tr> </tr>
<tr> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/synchronize"/>
<td>click</td>
<td>//a[@data-i18n='Synchronize']</td>
<td></td>
</tr>
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//button[@data-i18n='Filter']</td> <td>//button[@data-i18n='Filter']</td>
......
...@@ -110,4 +110,47 @@ ...@@ -110,4 +110,47 @@
<td></td> <td></td>
</tr> </tr>
</tal:block> </tal:block>
<tal:block metal:define-macro="wait_synchronize_end">
<tr>
<td>waitForElementPresent</td>
<td>//h3[text()[contains(.,'Synchronize your data')]]</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//h3[text()[contains(.,'Synchronize your data')]]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_spinner" />
</tal:block>
<tal:block metal:define-macro="synchronize">
<tr>
<td colspan="3"><b>Synchronize</b></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n="Storages"]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//a[@data-i18n="Storages"]</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[text() = "Erp5"]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//a[@data-i18n="Synchronize"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_synchronize_end" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/>
</tal:block>
</tal:block> </tal:block>
\ No newline at end of file
...@@ -176,31 +176,6 @@ ...@@ -176,31 +176,6 @@
<td></td> <td></td>
</tr> </tr>
</tal:block> </tal:block>
<tal:block metal:define-macro="synchronize">
<tr>
<td colspan="3"><b>Synchronize</b></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n="Synchronize"]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//a[@data-i18n="Synchronize"]</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class='ui-icon-spinner ui-btn-icon-notext first-loader']</td>
<td></td>
</tr>
<tr>
<td>waitForNotElementPresent</td>
<td>//div[@class='ui-icon-spinner ui-btn-icon-notext first-loader']</td>
<td></td>
</tr>
</tal:block>
<tal:block metal:define-macro="choice_erp5_storage"> <tal:block metal:define-macro="choice_erp5_storage">
<tr> <tr>
<td colspan="3"><b>Select Erp5 storage</b></td> <td colspan="3"><b>Select Erp5 storage</b></td>
...@@ -240,6 +215,8 @@ ...@@ -240,6 +215,8 @@
<td>name=submit</td> <td>name=submit</td>
<td></td> <td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_spinner" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_synchronize_end" />
</tal:block> </tal:block>
<tal:block metal:define-macro="remove_document_by_id"> <tal:block metal:define-macro="remove_document_by_id">
<tr> <tr>
......
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