[erp5_web_renderjs_ui_test] Dialog and form list search

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormDialogProceedAction.zpt

@@ -42,21 +42,8 @@
 </tr>
 
 <!-- Header has a save button -->
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@data-gadget-scope='header']//button[text()='Proceed' and @type='submit']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>assertElementPresent</td>
-  <td>//div[@data-gadget-scope='header']//button[text()='Proceed' and @type='submit']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>click</td>
-  <td>//div[@data-gadget-scope='header']//button[text()='Proceed' and @type='submit']</td>
-  <td></td>
-</tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" />
+
 <tr>
   <td>pause</td>
   <td>1000</td>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormListSearchResetsPagination.zpt

@@ -69,16 +69,9 @@
   <td>//a[@data-i18n='Previous']</td>
   <td></td>
 </tr>
-<tr>
-  <td>type</td>
-  <td>search</td>
-  <td>Title 10</td>
-</tr>
-<tr>
-  <td>click</td>
-  <td>//div[@data-gadget-scope='erp5_searchfield']//button[contains(@class, 'search_button')]</td>
-  <td></td>
-</tr>
+<tal:block tal:define="search_query python: 'Title 10'">
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/search_in_form_list" />
+</tal:block>
 <tr>
   <td>waitForElementNotPresent</td>
   <td>//a[@data-i18n='Previous']</td>
@@ -101,16 +94,9 @@
 </tr>
 
 <!-- Pagination keeps search query -->
-<tr>
-  <td>type</td>
-  <td>search</td>
-  <td>%</td>
-</tr>
-<tr>
-  <td>click</td>
-  <td>//div[@data-gadget-scope='erp5_searchfield']//button[contains(@class, 'search_button')]</td>
-  <td></td>
-</tr>
+<tal:block tal:define="search_query python: '%'">
+  <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/search_in_form_list" />
+</tal:block>
 <tr>
   <td>waitForElementPresent</td>
   <td>//span[@data-i18n='Records 1 - 3']</td>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewEditableWarning.zpt

@@ -59,17 +59,27 @@
 <!-- Warning is removed if page changed -->
 <tr>
   <td>click</td>
-  <td>//div[@data-gadget-scope='header']//a[text()='Add']</td>
+  <td>//div[@data-gadget-scope='header']//a[text()='Views']</td>
   <td></td>
 </tr>
 <tr>
   <td>waitForElementPresent</td>
-  <td>//div[@data-gadget-scope='header']//button[text()='Proceed' and @type='submit' and contains(@class, 'ui-icon-check')]</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Relation Fields' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'n.editable=true')]</td>
+  <td></td>
+</tr>
+<tr>
+  <td>click</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Relation Fields' and contains(@href, '#!change') and contains(@href, 'u.page=') and contains(@href, 'n.editable=true')]</td>
+  <td></td>
+</tr>
+<tr>
+  <td>waitForElementPresent</td>
+  <td>//div[@data-gadget-scope='header']//button[text()='Save' and @type='submit' and contains(@class, 'ui-icon-check')]</td>
   <td></td>
 </tr>
 <tr>
   <td>assertElementNotPresent</td>
-  <td>//div[@data-gadget-scope='header']//button[text()='Proceed' and @type='submit' and contains(@class, 'ui-icon-warning')]</td>
+  <td>//div[@data-gadget-scope='header']//button[text()='Save' and @type='submit' and contains(@class, 'ui-icon-warning')]</td>
   <td></td>
 </tr>
 

bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt

@@ -45,7 +45,7 @@
 
     <tr>
      <td>type</td>
-     <td>search</td>
+     <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']//input[@name='search']</td>
      <td></td>
     </tr>
 
@@ -57,7 +57,7 @@
 
     <tr>
      <td>click</td>
-     <td>//div[@data-gadget-scope='erp5_searchfield']//button[contains(@class, 'search_button')]</td>
+     <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']//div[@data-gadget-scope='erp5_searchfield']//button[contains(@class, 'search_button')]</td>
      <td></td>
     </tr>