web_renderjs_ui_test: make developer_mode_zuite compatible with Zope4 ZMI

also use the same pattern of clickAndWait and assertElementPresent
in all places, sometimes we used click and waitForElementPresent,
which should be equivalent because we click on a top level navigation
link

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_developer_mode_zuite/testDeveloperEditField.zpt

@@ -21,18 +21,13 @@
   <td></td>
 </tr>
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//label/a[@href="portal_skins/erp5_core/Preference_viewHtmlStyle/my_preferred_html_style_developper_mode/manage_main"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@href="fieldTest"]/span/strong</td>
-  <td></td>
-</tr>
 <tr>
   <td>assertElementPresent</td>
-  <td>//a[@href="fieldTest"]/span/strong</td>
+  <td>//a[@href="fieldTest"]/descendant-or-self::*[text()="Test"]</td>
   <td></td>
 </tr>
 <tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_developer_mode_zuite/testDeveloperEditForm.zpt

@@ -38,18 +38,13 @@
   <td></td>
 </tr>
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//div[@data-gadget-scope="erp5_form"]/a[@href="portal_skins/erp5_core/Preference_viewHtmlStyle/manage_main"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@href="formTest"]/span/strong</td>
-  <td></td>
-</tr>
 <tr>
   <td>assertElementPresent</td>
-  <td>//a[@href="formTest"]/span/strong</td>
+  <td>//a[@href="formTest"]/descendant-or-self::*[text()="Test"]</td>
   <td></td>
 </tr>
 </tbody></table>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_developer_mode_zuite/testDeveloperEditFormAction.zpt

@@ -37,18 +37,13 @@
   <td></td>
 </tr>
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//div[@data-gadget-scope="erp5_form"]/a[@href="hateoas/Base_edit/manage_main"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@href="ZScriptHTML_tryForm"]/span/strong</td>
-  <td></td>
-</tr>
 <tr>
   <td>assertElementPresent</td>
-  <td>//a[@href="ZScriptHTML_tryForm"]/span/strong</td>
+  <td>//a[@href="ZScriptHTML_tryForm"]/descendant-or-self::*[text()="Test"]</td>
   <td></td>
 </tr>
 <tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_developer_mode_zuite/testDeveloperModuleEditForm.zpt

@@ -38,18 +38,13 @@
   <td>current_location</td>
 </tr>
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//div[@data-gadget-scope="erp5_form"]/a[@href="portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/manage_main"]</td>
   <td></td>
 </tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@href="formTest"]/span/strong</td>
-  <td></td>
-</tr>
 <tr>
   <td>assertElementPresent</td>
-  <td>//a[@href="formTest"]/span/strong</td>
+  <td>//a[@href="formTest"]/descendant-or-self::*[text()="Test"]</td>
   <td></td>
 </tr>
 <tr>
@@ -64,13 +59,13 @@
   <td></td>
 </tr>
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//div[@data-gadget-scope="erp5_form"]/a[@href="hateoas/Base_doSelect/manage_main"]</td>
   <td></td>
 </tr>
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@href="ZScriptHTML_tryForm"]/span/strong</td>
+  <td>assertElementPresent</td>
+  <td>//a[@href="ZScriptHTML_tryForm"]/descendant-or-self::*[text()="Test"]</td>
   <td></td>
 </tr>
 <tr>
@@ -95,8 +90,8 @@
   <td></td>
 </tr>
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@href="fieldTest"]/span/strong</td>
+  <td>assertElementPresent</td>
+  <td>//a[@href="fieldTest"]/descendant-or-self::*[text()="Test"]</td>
   <td></td>
 </tr>
 <tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_developer_mode_zuite/testDeveloperModuleEditFormAction.zpt

@@ -43,8 +43,8 @@
   <td></td>
 </tr>
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@href="ZScriptHTML_tryForm"]/span/strong</td>
+  <td>assertElementPresent</td>
+  <td>//a[@href="ZScriptHTML_tryForm"]/descendant-or-self::*[text()="Test"]</td>
   <td></td>
 </tr>
 <tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_developer_mode_zuite/testDeveloperModuleEditLisbox.zpt

@@ -23,13 +23,13 @@
 </tr>
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 <tr>
-  <td>click</td>
+  <td>clickAndWait</td>
   <td>//div[contains(@data-gadget-url, 'gadget_erp5_label_field.html')]/a[@href="portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox/manage_main"]</td>
   <td></td>
 </tr>
 <tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@href="fieldTest"]/span/strong</td>
+  <td>assertElementPresent</td>
+  <td>//a[@href="fieldTest"]/descendant-or-self::*[text()="Test"]</td>
   <td></td>
 </tr>
 <tr>