[erp5_officejs_ui_test] add waiting finish synchronize

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyOfficeSpreadsheetConvert.zpt

@@ -79,16 +79,7 @@
   <td>//div[@data-gadget-scope="notification"]//button[text()='Data Updated']</td>
   <td></td>
 </tr>
-<tr>
-  <td>click</td>
-  <td>//a[@data-i18n="Synchronize"]</td>
-  <td></td>
-</tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[text()='Add']</td>
-  <td></td>
-</tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/synchronize"/>
 <tr>
   <td>open</td>
   <td>${base_url}/portal_skins/erp5_officejs_ui_test/gadget_ooffice_spreadsheet_convert_check.html</td>

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetBadDocumentState.zpt

@@ -39,8 +39,7 @@
   </tr>
   <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_CommonTemplateForOnlyOffice/macros/synchronize"/>
-  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/>
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/synchronize"/>
   <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"/>
 

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_spreadsheet_zuite/testOnlyfficeSpreadsheetErp5Synchronization.zpt

@@ -115,8 +115,7 @@
     <tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOfficeCell/macros/current_cell" />
   </tal:block-->
 
-  <tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/synchronize"/>
-  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/>
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/synchronize"/>
 
   <!-- XXX Romain -->
   <!--tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/open_document_with_title"/>

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_text_zuite/testOnlyfficeTextErp5Synchronization.zpt

@@ -185,11 +185,7 @@
   <td>description</td>
   <td>${description}</td>
 </tr>
-<tr>
-  <td>click</td>
-  <td>//a[@data-i18n='Synchronize']</td>
-  <td></td>
-</tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/synchronize"/>
 <tr>
   <td>waitForElementPresent</td>
   <td>//button[@data-i18n='Filter']</td>

bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/Zuite_CommonTemplateForOfficejsUi.zpt

@@ -110,4 +110,47 @@
       <td></td>
     </tr>
   </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>
\ No newline at end of file

bt5/erp5_officejs_ui_test/SkinTemplateItem/portal_skins/erp5_officejs_ui_test/Zuite_CommonTemplateForOnlyOffice.zpt

@@ -176,31 +176,6 @@
       <td></td>
     </tr>
   </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">
     <tr>
       <td colspan="3"><b>Select Erp5 storage</b></td>
@@ -240,6 +215,8 @@
       <td>name=submit</td>
       <td></td>
     </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 metal:define-macro="remove_document_by_id">
     <tr>