[erp5_officejs_ui_test] Handle officejs install

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_bookmark_zuite/testOfficeJSBookmarkManager.zpt

@@ -197,7 +197,7 @@
 <!-- Add bookmark With Dispatcher Command -->
 <tr>
   <td>open</td>
-  <td>${base_url}/web_site_module/${test_url}/</td>
+  <td>${base_url}/web_site_module/${install_url}/</td>
   <td></td>
 </tr>
 <tr>
@@ -299,7 +299,7 @@
 <!-- Set preferences -->
 <tr>
   <td>open</td>
-  <td>${base_url}/web_site_module/${test_url}/</td>
+  <td>${base_url}/web_site_module/${install_url}/</td>
   <td></td>
 </tr>
 <tr>

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_driveapp_zuite/testOfficeJSDriveApp.zpt

@@ -26,6 +26,26 @@
 <tal:block tal:define="web_site_name python: 'officejs_drive_app'">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/install_offline_and_redirect" />
 </tal:block>
+<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>link=Local is Enough</td>
+  <td></td>
+</tr>
+<tr>
+  <td>click</td>
+  <td>link=Local is Enough</td>
+  <td></td>
+</tr>
 <tr>
   <td>waitForElementPresent</td>
   <td>link=Add</td>

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_presentation_zuite/testOnlyOfficePresentationConvert.zpt

@@ -33,10 +33,11 @@
   <td></td>
 </tr>
 <tr>
-  <td>open</td>
-  <td>${base_url}/web_site_module/ooffice_presentation/</td>
-  <td></td>
+  <td>store</td>
+  <td>ooffice_presentation</td>
+  <td>install_url</td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
 <tr>
   <td>waitForElementPresent</td>
   <td>//a[@data-i18n="Storages"]</td>

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_ooo_presentation_zuite/testOnlyfficePresentationSave.zpt

@@ -21,18 +21,12 @@
   <td>Reset Successfully.</td>
   <td></td>
 </tr>
-<!-- Initialize -->
 <tr>
-  <td>open</td>
-  <td>${base_url}/web_site_module/ooffice_presentation/</td>
-  <td></td>
-</tr>
-<!-- Install can be longer than 90s -->
-<tr>
-  <td>pause</td>
-  <td>60000</td>
-  <td></td>
+  <td>store</td>
+  <td>ooffice_presentation</td>
+  <td>install_url</td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
 <tr>
   <td>waitForElementPresent</td>
   <td>//a[@data-i18n="Storages"]</td>

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

@@ -33,10 +33,11 @@
   <td></td>
 </tr>
 <tr>
-  <td>open</td>
-  <td>${base_url}/web_site_module/ooffice_spreadsheet/</td>
-  <td></td>
+  <td>store</td>
+  <td>ooffice_spreadsheet</td>
+  <td>install_url</td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
 <tr>
   <td>waitForElementPresent</td>
   <td>//a[@data-i18n="Storages"]</td>

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

@@ -20,10 +20,11 @@
     <td>title</td>
   </tr>
   <tr>
-    <td>open</td>
-    <td>${base_url}/web_site_module/ooffice_spreadsheet/</td>
-    <td></td>
+    <td>store</td>
+    <td>ooffice_spreadsheet</td>
+    <td>install_url</td>
   </tr>
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/choice_erp5_storage"/>
   <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"/>
@@ -39,7 +40,7 @@
 
   <tr>
     <td>open</td>
-    <td>${base_url}/web_site_module/${test_url}/</td>
+    <td>${base_url}/web_site_module/${install_url}/</td>
     <td></td>
   </tr>
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/open_document_with_title"/>

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

@@ -83,16 +83,11 @@
   </tr>
 
   <tr>
-    <td>open</td>
-    <td>${base_url}/web_site_module/ooffice_spreadsheet/</td>
-    <td></td>
-  </tr>
-  <!-- Install can be longer than 90s -->
-  <tr>
-    <td>pause</td>
-    <td>30000</td>
-    <td></td>
+    <td>store</td>
+    <td>ooffice_spreadsheet</td>
+    <td>install_url</td>
   </tr>
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForOnlyOffice/macros/choice_erp5_storage"/>
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/>
 

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

@@ -21,18 +21,12 @@
   <td>Reset Successfully.</td>
   <td></td>
 </tr>
-<!-- Initialize -->
 <tr>
-  <td>open</td>
-  <td>${base_url}/web_site_module/ooffice_spreadsheet/</td>
-  <td></td>
-</tr>
-<!-- Install can be longer than 90s -->
-<tr>
-  <td>pause</td>
-  <td>60000</td>
-  <td></td>
+  <td>store</td>
+  <td>ooffice_spreadsheet</td>
+  <td>install_url</td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
 <tr>
   <td>waitForElementPresent</td>
   <td>//a[@data-i18n="Storages"]</td>

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

@@ -33,10 +33,11 @@
   <td></td>
 </tr>
 <tr>
-  <td>open</td>
-  <td>${base_url}/web_site_module/ooffice_text/</td>
-  <td></td>
+  <td>store</td>
+  <td>ooffice_text</td>
+  <td>install_url</td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
 <tr>
   <td>waitForElementPresent</td>
   <td>//a[@data-i18n="Storages"]</td>

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

@@ -21,18 +21,12 @@
   <td>Reset Successfully.</td>
   <td></td>
 </tr>
-<!-- Initialize -->
 <tr>
-  <td>open</td>
-  <td>${base_url}/web_site_module/ooffice_text/</td>
-  <td></td>
-</tr>
-<!-- Install can be longer than 90s -->
-<tr>
-  <td>pause</td>
-  <td>30000</td>
-  <td></td>
+  <td>store</td>
+  <td>ooffice_text</td>
+  <td>install_url</td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
 <tr>
   <td>waitForElementPresent</td>
   <td>//a[@data-i18n="Storages"]</td>

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

@@ -21,18 +21,12 @@
   <td>Reset Successfully.</td>
   <td></td>
 </tr>
-<!-- Initialize -->
 <tr>
-  <td>open</td>
-  <td>${base_url}/web_site_module/ooffice_text/</td>
-  <td></td>
-</tr>
-<!-- Install can be longer than 90s -->
-<tr>
-  <td>pause</td>
-  <td>60000</td>
-  <td></td>
+  <td>store</td>
+  <td>ooffice_text</td>
+  <td>install_url</td>
 </tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
 <tr>
   <td>waitForElementPresent</td>
   <td>//a[@data-i18n="Storages"]</td>

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

 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"
            xmlns:metal="http://xml.zope.org/namespaces/metal">
 
+  <tal:block metal:define-macro="wait_install">
+    <tr>
+      <td colspan="3"><b>Install web site</b></td>
+    </tr>
+    <!-- Huge timout for onlyoffice_presentation ( 120s is enought for all other app ) -->
+    <tr>
+      <td>setTimeout</td>
+      <td>160000</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>open</td>
+      <td>${base_url}/web_site_module/${install_url}/</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>waitForCondition</td>
+      <td>selenium.browserbot.currentWindow.navigator.serviceWorker.controller !== null</td>
+      <td>150000</td>
+    </tr>
+    <tr>
+      <td>setTimeout</td>
+      <td>90000</td>
+      <td></td>
+    </tr>
+  </tal:block>
+
   <tal:block metal:define-macro="install_offline_and_redirect">
     <tr>
       <td colspan="3"><b tal:content="python: 'Clone web site %s' % web_site_name"></b></td>
@@ -28,17 +55,10 @@
     <tr>
       <td>storeValue</td>
       <td>name=field_my_id</td>
-      <td>test_url</td>
+      <td>install_url</td>
     </tr>
     <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
-    <tr>
-      <td colspan="3"><b>Install cloned web site</b></td>
-    </tr>
-    <tr>
-      <td>open</td>
-      <td>${base_url}/web_site_module/${test_url}/</td>
-      <td></td>
-    </tr>
+    <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
     <tr>
       <td>waitForElementPresent</td>
       <td>//a[@data-i18n='Storages']</td>
@@ -60,7 +80,7 @@
     <tr>
       <td>type</td>
       <td>name=ids:list</td>
-      <td>${test_url}</td>
+      <td>${install_url}</td>
     </tr>
     <tr>
       <td>clickAndWait</td>
@@ -72,7 +92,7 @@
     </tr>
     <tr>
       <td>open</td>
-      <td>${base_url}/web_site_module/${test_url}/</td>
+      <td>${base_url}/web_site_module/${install_url}/</td>
       <td></td>
     </tr>
   </tal:block>