[erp5_web_renderjs_ui_test] Update test to match new module list

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageFrontModuleList.zpt

@@ -23,15 +23,10 @@
   <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_page_front.html']</td>
   <td></td>
 </tr>
-<tr>
-  <td>waitForTextPresent</td>
-  <td>Other</td>
-  <td></td>
-</tr>
 
 <!-- Generate links to module -->
 <tr>
-  <td>assertElementPresent</td>
+  <td>waitForElementPresent</td>
   <td>//div[@data-gadget-scope='m']//a[text()='Bars' and contains(@href, '#!display_stored_state') and contains(@href, 'n.jio_key=bar_module')]</td>
   <td></td>
 </tr>
@@ -55,7 +50,7 @@
 </tr>
 <tr>
   <td>waitForTextPresent</td>
-  <td>Foos</td>
+  <td>Foo Module</td>
   <td></td>
 </tr>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_zuite/testPageHistoryDocumentListOnlyShowModuleSubDocuments.zpt

@@ -19,17 +19,7 @@
 </tr>
 <tr>
   <td>waitForElementPresent</td>
-  <td>//h3[@data-i18n='Other']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>click</td>
-  <td>//h3[@data-i18n='Other']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@data-i18n='Foos']</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Foos' and contains(@href, '#!display_stored_state') and contains(@href, 'n.jio_key=foo_module')]</td>
   <td></td>
 </tr>
 <tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_router_zuite/testCommandDisplayStoredStateJumpToLatestDocumentContext.zpt

@@ -71,32 +71,21 @@
   <td></td>
 </tr>
 
-<!-- Go back to foo module -->
 <tr>
   <td>waitForElementPresent</td>
-  <td>//h3[@data-i18n='Other']</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Foos']</td>
   <td></td>
 </tr>
 <tr>
   <td>click</td>
-  <td>//h3[@data-i18n='Other']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//div[@data-gadget-scope='m']//a[@data-i18n='Foos']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>click</td>
-  <td>//div[@data-gadget-scope='m']//a[@data-i18n='Foos']</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Foos']</td>
   <td></td>
 </tr>
 
 <!-- Wait for gadget to be loaded -->
 <tr>
   <td>waitForElementPresent</td>
-  <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']</td>
+  <td>//div[@data-gadget-scope='erp5_searchfield']//input[@value='title' and @type='search' and @name='search']</td>
   <td></td>
 </tr>
 <tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/relationfield_zuite/testMultiRelationFieldWithNonSavedPageContent.zpt

@@ -354,17 +354,22 @@
 
 <tr>
   <td>waitForElementPresent</td>
-  <td>//a[@data-i18n="Foos"]</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Foos' and contains(@href, '#!display_stored_state') and contains(@href, 'n.jio_key=foo_module')]</td>
   <td></td>
 </tr>
 
 
 <tr>
   <td>click</td>
-  <td>//a[@data-i18n="Foos"]</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Foos' and contains(@href, '#!display_stored_state') and contains(@href, 'n.jio_key=foo_module')]</td>
   <td></td>
 </tr>
 
+<tr>
+  <td>waitForTextPresent</td>
+  <td>Foo Module</td>
+  <td></td>
+</tr>
 <tr>
   <td>waitForElementPresent</td>
   <td>//tbody/tr[1]/th/a</td>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/relationfield_zuite/testRelationFieldWithNonSavedPageContent.zpt

@@ -424,14 +424,20 @@
 
 <tr>
   <td>waitForElementPresent</td>
-  <td>//a[@data-i18n="Foos"]</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Foos' and contains(@href, '#!display_stored_state') and contains(@href, 'n.jio_key=foo_module')]</td>
   <td></td>
 </tr>
 
 
 <tr>
   <td>click</td>
-  <td>//a[@data-i18n="Foos"]</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Foos' and contains(@href, '#!display_stored_state') and contains(@href, 'n.jio_key=foo_module')]</td>
+  <td></td>
+</tr>
+
+<tr>
+  <td>waitForTextPresent</td>
+  <td>Foo Module</td>
   <td></td>
 </tr>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_zuite/testRenderjsBasicNavigation.zpt

@@ -52,22 +52,14 @@
 
 <tr>
   <td>waitForElementPresent</td>
-  <td>//h3[@data-i18n='Other']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>click</td>
-  <td>//h3[@data-i18n='Other']</td>
-  <td></td>
-</tr>
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@data-i18n='Bars']</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Bars' and contains(@href, '#!display_stored_state') and contains(@href, 'n.jio_key=bar_module')]</td>
   <td></td>
 </tr>
+
+
 <tr>
   <td>click</td>
-  <td>link=Bars</td>
+  <td>//div[@data-gadget-scope='m']//a[text()='Bars' and contains(@href, '#!display_stored_state') and contains(@href, 'n.jio_key=bar_module')]</td>
   <td></td>
 </tr>
 <tr>