[erp5_web_renderjs_ui_test] Update relation field tests

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>