diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testBreadcrumbCanNotAccessRelationSearchPage.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testBreadcrumbCanNotAccessRelationSearchPage.zpt index 5072f75f3a9da5fc33427d85868a94bd8395dd10..5dac9ebf66d84b9b1c506f3b5cacbff0ff25d880 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testBreadcrumbCanNotAccessRelationSearchPage.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testBreadcrumbCanNotAccessRelationSearchPage.zpt @@ -27,8 +27,9 @@ <td>${base_url}/web_site_module/renderjs_runner/#/foo_module</td> <td></td> </tr> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" /> <tr> - <td>waitForElementPresent</td> + <td>assertElementPresent</td> <td>//a[@data-i18n='Add']</td> <td></td> </tr> @@ -147,12 +148,7 @@ </tr> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/clear_query" /> - -<tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationDefaultSortAndParameterList.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationDefaultSortAndParameterList.zpt index 474d1503b0ebb1ec80606e4640a1c933d3071189..ce0589686c199f48f0877c667a5482c3249cb0fa 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationDefaultSortAndParameterList.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationDefaultSortAndParameterList.zpt @@ -199,15 +199,11 @@ <td></td> </tr> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - -<tr> - <td>waitForElementPresent</td> + <td>assertElementPresent</td> <td>//div[@data-gadget-scope='field_listbox']//tbody/tr[1]</td> <td></td> </tr> @@ -215,7 +211,7 @@ <!-- test sort --> <tr> - <td>verifyElementPresent</td> + <td>assertElementPresent</td> <td>//div[@data-gadget-scope='field_listbox']//tbody/tr[1]//a[contains(text(), '4')]</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldEmptySearchWithListbox.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldEmptySearchWithListbox.zpt index 3a39cbc134ac3f5c16db09608eb930862a41759c..e825d71de05b8dabd5c5d96aa075205027dcd2fe 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldEmptySearchWithListbox.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldEmptySearchWithListbox.zpt @@ -232,12 +232,8 @@ <td></td> </tr> -<tr> - <td>waitForElementPresent</td> - <td>//button[@class="ui-icon-warning ui-btn-icon-left "]</td> - <td></td> -</tr> - +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> <td>verifyValue</td> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldSearchWithListbox.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldSearchWithListbox.zpt index 0a587df10fda5d25f73125283555d7533668be4a..57aadfae8ef7889a44d0ee9c9c928034bac8bee8 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldSearchWithListbox.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldSearchWithListbox.zpt @@ -256,12 +256,8 @@ <td></td> </tr> -<tr> - <td>waitForElementPresent</td> - <td>//button[@class="ui-icon-warning ui-btn-icon-left "]</td> - <td></td> -</tr> - +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> <td>verifyValue</td> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldWithNonSavedPageContent.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldWithNonSavedPageContent.zpt index 7a8eeb1e9f553c79fa4fbda38d96468172f2b6f4..05723f0cd8a7a81a81011d95d36b22095eb20a14 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldWithNonSavedPageContent.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testMultiRelationFieldWithNonSavedPageContent.zpt @@ -335,7 +335,7 @@ <tr> <td>click</td> - <td>//a[@data-i18n="Modules"]</td> + <td>//a[text()="Modules"]</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testProxyListBox.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testProxyListBox.zpt index 5b2ba272da78659d6ab66050458d15def36c8192..bcf9d6d5af1a7c55eacc907f8454b4ac2ed3f017 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testProxyListBox.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testProxyListBox.zpt @@ -269,19 +269,15 @@ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" /> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> + <tal:block tal:define="parsed_query python: ''; search_query python: ''"> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" /> </tal:block> <tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - -<tr> - <td>waitForElementPresent</td> + <td>assertElementPresent</td> <td>//tbody//tr[1]</td> <td></td> </tr> @@ -311,20 +307,8 @@ <td>//select</td> <td>index=2</td> </tr> - -<tr> - <td>waitForElementNotPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - - -<tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> <td>assertSelected</td> @@ -359,20 +343,8 @@ <td>//select</td> <td>index=1</td> </tr> - -<tr> - <td>waitForElementNotPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - - -<tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> <td>assertSelected</td> @@ -411,12 +383,6 @@ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/search_in_form_list" /> </tal:block> -<tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - <tr> <td>waitForElementPresent</td> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationDefaultSortAndParameterList.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationDefaultSortAndParameterList.zpt index 0473673befef57671e6c18793caca666152e6666..e9e8c28818dcdce47374966e71ccf09b23a75b80 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationDefaultSortAndParameterList.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationDefaultSortAndParameterList.zpt @@ -199,15 +199,11 @@ <td></td> </tr> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - -<tr> - <td>waitForElementPresent</td> + <td>assertElementPresent</td> <td>//div[@data-gadget-scope='field_listbox']//tbody/tr[1]</td> <td></td> </tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldEmptySearchWithListbox.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldEmptySearchWithListbox.zpt index bfc80e713f323ca18a049c4fae05612e7222564e..1ca78266edbc4c470c8f885ce585fa23808fde6d 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldEmptySearchWithListbox.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldEmptySearchWithListbox.zpt @@ -153,19 +153,15 @@ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" /> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> + <tal:block tal:define="parsed_query python: ''; search_query python: ''"> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" /> </tal:block> <tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - -<tr> - <td>waitForElementPresent</td> + <td>assertElementPresent</td> <td>//tbody/tr[1]</td> <td></td> </tr> @@ -176,13 +172,8 @@ <td></td> </tr> - -<tr> - <td>waitForElementPresent</td> - <td>//button[@class="ui-icon-warning ui-btn-icon-left "]</td> - <td></td> -</tr> - +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> <td>verifyValue</td> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldSearchWithListbox.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldSearchWithListbox.zpt index 6b615abc307e5d5789f013a8d095baa3b9ffb2af..19b96bd5e92828618f99ca7c3b4235db1e698090 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldSearchWithListbox.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldSearchWithListbox.zpt @@ -176,19 +176,14 @@ <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" /> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tal:block tal:define="parsed_query python: ''; search_query python: ''"> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" /> </tal:block> <tr> - <td>waitForElementPresent</td> - <td>//a[@data-i18n="Previous"]</td> - <td></td> -</tr> - -<tr> - <td>waitForElementPresent</td> + <td>assertElementPresent</td> <td>//tbody/tr[1]</td> <td></td> </tr> @@ -198,13 +193,8 @@ <td>//tbody/tr[1]//a</td> <td></td> </tr> - - -<tr> - <td>waitForElementPresent</td> - <td>//button[@class="ui-icon-warning ui-btn-icon-left "]</td> - <td></td> -</tr> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldWithNonSavedPageContent.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldWithNonSavedPageContent.zpt index 9495e07b3c084a0bec59d09a115b91ee3689fa0b..7b88e662c1e08670d8abe85cb633487ca96fb374 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldWithNonSavedPageContent.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_relation_field_zuite/testRelationFieldWithNonSavedPageContent.zpt @@ -392,7 +392,7 @@ <tr> <td>click</td> - <td>//a[@data-i18n="Modules"]</td> + <td>//a[text()="Modules"]</td> <td></td> </tr>