Commit bb75380b authored by Vincent Bechu's avatar Vincent Bechu

[erp5_officejs_ui_test] Handle officejs install

parent 6d08d51b
...@@ -197,7 +197,7 @@ ...@@ -197,7 +197,7 @@
<!-- Add bookmark With Dispatcher Command --> <!-- Add bookmark With Dispatcher Command -->
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/web_site_module/${test_url}/</td> <td>${base_url}/web_site_module/${install_url}/</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
<!-- Set preferences --> <!-- Set preferences -->
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/web_site_module/${test_url}/</td> <td>${base_url}/web_site_module/${install_url}/</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -26,6 +26,26 @@ ...@@ -26,6 +26,26 @@
<tal:block tal:define="web_site_name python: 'officejs_drive_app'"> <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 metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/install_offline_and_redirect" />
</tal:block> </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> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>link=Add</td> <td>link=Add</td>
......
...@@ -33,10 +33,11 @@ ...@@ -33,10 +33,11 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_presentation/</td> <td>ooffice_presentation</td>
<td></td> <td>install_url</td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//a[@data-i18n="Storages"]</td> <td>//a[@data-i18n="Storages"]</td>
......
...@@ -21,18 +21,12 @@ ...@@ -21,18 +21,12 @@
<td>Reset Successfully.</td> <td>Reset Successfully.</td>
<td></td> <td></td>
</tr> </tr>
<!-- Initialize -->
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_presentation/</td> <td>ooffice_presentation</td>
<td></td> <td>install_url</td>
</tr>
<!-- Install can be longer than 90s -->
<tr>
<td>pause</td>
<td>60000</td>
<td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//a[@data-i18n="Storages"]</td> <td>//a[@data-i18n="Storages"]</td>
......
...@@ -33,10 +33,11 @@ ...@@ -33,10 +33,11 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_spreadsheet/</td> <td>ooffice_spreadsheet</td>
<td></td> <td>install_url</td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//a[@data-i18n="Storages"]</td> <td>//a[@data-i18n="Storages"]</td>
......
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
<td>title</td> <td>title</td>
</tr> </tr>
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_spreadsheet/</td> <td>ooffice_spreadsheet</td>
<td></td> <td>install_url</td>
</tr> </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_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_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"/>
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/web_site_module/${test_url}/</td> <td>${base_url}/web_site_module/${install_url}/</td>
<td></td> <td></td>
</tr> </tr>
<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"/>
......
...@@ -83,16 +83,11 @@ ...@@ -83,16 +83,11 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_spreadsheet/</td> <td>ooffice_spreadsheet</td>
<td></td> <td>install_url</td>
</tr>
<!-- Install can be longer than 90s -->
<tr>
<td>pause</td>
<td>30000</td>
<td></td>
</tr> </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_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_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded"/>
......
...@@ -21,18 +21,12 @@ ...@@ -21,18 +21,12 @@
<td>Reset Successfully.</td> <td>Reset Successfully.</td>
<td></td> <td></td>
</tr> </tr>
<!-- Initialize -->
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_spreadsheet/</td> <td>ooffice_spreadsheet</td>
<td></td> <td>install_url</td>
</tr>
<!-- Install can be longer than 90s -->
<tr>
<td>pause</td>
<td>60000</td>
<td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//a[@data-i18n="Storages"]</td> <td>//a[@data-i18n="Storages"]</td>
......
...@@ -33,10 +33,11 @@ ...@@ -33,10 +33,11 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_text/</td> <td>ooffice_text</td>
<td></td> <td>install_url</td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//a[@data-i18n="Storages"]</td> <td>//a[@data-i18n="Storages"]</td>
......
...@@ -21,18 +21,12 @@ ...@@ -21,18 +21,12 @@
<td>Reset Successfully.</td> <td>Reset Successfully.</td>
<td></td> <td></td>
</tr> </tr>
<!-- Initialize -->
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_text/</td> <td>ooffice_text</td>
<td></td> <td>install_url</td>
</tr>
<!-- Install can be longer than 90s -->
<tr>
<td>pause</td>
<td>30000</td>
<td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//a[@data-i18n="Storages"]</td> <td>//a[@data-i18n="Storages"]</td>
......
...@@ -21,18 +21,12 @@ ...@@ -21,18 +21,12 @@
<td>Reset Successfully.</td> <td>Reset Successfully.</td>
<td></td> <td></td>
</tr> </tr>
<!-- Initialize -->
<tr> <tr>
<td>open</td> <td>store</td>
<td>${base_url}/web_site_module/ooffice_text/</td> <td>ooffice_text</td>
<td></td> <td>install_url</td>
</tr>
<!-- Install can be longer than 90s -->
<tr>
<td>pause</td>
<td>60000</td>
<td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//a[@data-i18n="Storages"]</td> <td>//a[@data-i18n="Storages"]</td>
......
<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal" <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"> 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"> <tal:block metal:define-macro="install_offline_and_redirect">
<tr> <tr>
<td colspan="3"><b tal:content="python: 'Clone web site %s' % web_site_name"></b></td> <td colspan="3"><b tal:content="python: 'Clone web site %s' % web_site_name"></b></td>
...@@ -28,17 +55,10 @@ ...@@ -28,17 +55,10 @@
<tr> <tr>
<td>storeValue</td> <td>storeValue</td>
<td>name=field_my_id</td> <td>name=field_my_id</td>
<td>test_url</td> <td>install_url</td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" /> <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<tr> <tal:block metal:use-macro="here/Zuite_CommonTemplateForOfficejsUi/macros/wait_install" />
<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>
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//a[@data-i18n='Storages']</td> <td>//a[@data-i18n='Storages']</td>
...@@ -60,7 +80,7 @@ ...@@ -60,7 +80,7 @@
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=ids:list</td> <td>name=ids:list</td>
<td>${test_url}</td> <td>${install_url}</td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
...@@ -72,7 +92,7 @@ ...@@ -72,7 +92,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/web_site_module/${test_url}/</td> <td>${base_url}/web_site_module/${install_url}/</td>
<td></td> <td></td>
</tr> </tr>
</tal:block> </tal:block>
......
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