[erp5_web_renderjs_ui_test] Fixes

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_list_field_zuite/testDisabledOptionListField.zpt

@@ -72,12 +72,12 @@
   <td colspan="3"><b>Trying to save disabled option</b></td>
 </tr>
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_save" />
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 
 <tal:block tal:define="notification_configuration python: {'class': 'error',
                                                            'text': 'Input data has errors.'}">
   <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_notification" />
 </tal:block>
-<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 
 <tr>
   <td>assertTextPresent</td>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_listbox_zuite/testFilter.zpt

@@ -78,9 +78,10 @@
 
 <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" />
 
 <tr>
-  <td>verifyElementPresent</td>
+  <td>assertElementPresent</td>
   <td>link=Title 0</td>
   <td></td>
 </tr>
@@ -98,28 +99,29 @@
 <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" />
 
 <tr>
-  <td>verifyElementPresent</td>
+  <td>assertElementPresent</td>
   <td>link=Title 9</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>verifyElementPresent</td>
+  <td>assertElementPresent</td>
   <td>link=Title 8</td>
   <td></td>
 </tr>
 
 
 <tr>
-  <td>verifyElementPresent</td>
+  <td>assertElementPresent</td>
   <td>link=Title 7</td>
   <td></td>
 </tr>
 
 <tr>
-  <td>verifyElementNotPresent</td>
+  <td>assertElementNotPresent</td>
   <td>link=Title 0</td>
   <td></td>
 </tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt

@@ -60,12 +60,12 @@
 </tr>
 <tr>
   <td>waitForElementPresent</td>
-  <td>//a[@data-i18n='Logout']</td>
+  <td>//a[text()='Logout']</td>
   <td></td>
 </tr>
 <tr>
   <td>click</td>
-  <td>//a[@data-i18n='Logout']</td>
+  <td>//a[text()='Logout']</td>
   <td></td>
 </tr>
 <tr>
@@ -127,12 +127,12 @@
 </tr>
 <tr>
   <td>waitForElementPresent</td>
-  <td>//a[@data-i18n='Logout']</td>
+  <td>//a[text()='Logout']</td>
   <td></td>
 </tr>
 <tr>
   <td>click</td>
-  <td>//a[@data-i18n='Logout']</td>
+  <td>//a[text()='Logout']</td>
   <td></td>
 </tr>
 <tr>

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

@@ -53,14 +53,14 @@
 
 <tr>
   <td>verifyElementPresent</td>
-  <td>//h1[@data-i18n='Edit Workflow']</td>
+  <td>//h1[contains(text(), 'Edit Workflow')]</td>
   <td></td>
 </tr>
 
 
 <tr>
   <td>verifyElementPresent</td>
-  <td>//h1[@data-i18n='Foo Workflow']</td>
+  <td>//h1[contains(text(), 'Foo Workflow')]</td>
   <td></td>
 </tr>
 
@@ -93,7 +93,7 @@
 
 <tr>
   <td>waitForElementPresent</td>
-  <td>//h1[@data-i18n='External Processing Workflow']</td>
+  <td>//h1[contains(text(), 'External Processing Workflow')]</td>
   <td></td>
 </tr>
 
@@ -101,14 +101,14 @@
 
 <tr>
   <td>verifyElementPresent</td>
-  <td>//h1[@data-i18n='Document Publication Workflow']</td>
+  <td>//h1[contains(text(), 'Document Publication Workflow')]</td>
   <td></td>
 </tr>
 
 
 <tr>
   <td>verifyElementPresent</td>
-  <td>//h1[@data-i18n='Edit Workflow']</td>
+  <td>//h1[contains(text(), 'Edit Workflow')]</td>
   <td></td>
 </tr>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_recover_password_zuite/testRenderjsRecoverPassword.zpt

@@ -71,12 +71,12 @@
 </tr>
 <tr>
   <td>waitForElementPresent</td>
-  <td>//a[@data-i18n='Logout']</td>
+  <td>//a[text()='Logout']</td>
   <td></td>
 </tr>
 <tr>
   <td>click</td>
-  <td>//a[@data-i18n='Logout']</td>
+  <td>//a[text()='Logout']</td>
   <td></td>
 </tr>
 <tr>
@@ -235,7 +235,7 @@
 </tr>
 <tr>
   <td>waitForElementPresent</td>
-  <td>//h1//a[@data-i18n='Worklist']</td>
+  <td>//h1//a[text()='Worklist']</td>
   <td></td>
 </tr>
 

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

@@ -102,7 +102,7 @@
 </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" />
 
 <!-- Go to the first element -->
 <tr>

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageFront.zpt

@@ -22,7 +22,7 @@
 
 <tr>
   <td>waitForElementPresent</td>
-  <td>//a[@data-i18n="Modules"]</td>
+  <td>//a[text()="mokuai"]</td>
   <td></td>
 </tr>
  
@@ -30,7 +30,7 @@
 
  <tr>
    <td>click</td>
-   <td>//a[@data-i18n="Modules"]</td>
+   <td>//a[text()="mokuai"]</td>
    <td></td>
  </tr>
  

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageLanguage.zpt

@@ -35,14 +35,14 @@
 <!-- default has two language -->
 <tr>
   <td>assertElementPresent</td>
-  <td>//option[@data-i18n='Wolof']</td>
+  <td>//option[text()='Wolof']</td>
   <td></td>
 </tr>
 
 
 <tr>
   <td>verifyElementPresent</td>
-  <td>//option[@data-i18n='English']</td>
+  <td>//option[text()='English']</td>
   <td></td>
 </tr>
 
@@ -95,48 +95,48 @@
 
  <tr>
    <td>verifyText</td>
-   <td>//a[@data-i18n="Home"]</td>
+   <td>//a[@class="ui-btn-icon-left ui-icon-home"]</td>
    <td>Home</td>
  </tr>
 
 
  <tr>
    <td>verifyText</td>
-   <td>//a[@data-i18n="Modules"]</td>
+   <td>//a[@class="ui-btn-icon-left ui-icon-puzzle-piece"]</td>
    <td>Modules</td>
  </tr>
  
   <tr>
    <td>verifyText</td>
-   <td>//a[@data-i18n="Worklists"]</td>
+   <td>//a[@class="ui-btn-icon-left ui-icon-tasks"]</td>
    <td>Worklists</td>
  </tr>
  
  
   <tr>
    <td>verifyText</td>
-   <td>//a[@data-i18n="History"]</td>
+   <td>//a[@class="ui-btn-icon-left ui-icon-history"]</td>
    <td>History</td>
  </tr>
  
  
   <tr>
    <td>verifyText</td>
-   <td>//a[@data-i18n="Search"]</td>
+   <td>//a[@class="ui-btn-icon-left ui-icon-search"]</td>
    <td>Search</td>
  </tr>
  
  
   <tr>
    <td>verifyText</td>
-   <td>//a[@data-i18n="Preferences"]</td>
+   <td>//a[@class="ui-btn-icon-left ui-icon-sliders"]</td>
    <td>Preferences</td>
  </tr>
  
  
   <tr>
    <td>verifyText</td>
-   <td>//a[@data-i18n="Logout"]</td>
+   <td>//a[@class="ui-btn-icon-left ui-icon-power-off"]</td>
    <td>Logout</td>
  </tr>
 

bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPanel.zpt

@@ -19,23 +19,19 @@
   <td></td>
 </tr>
 
-<tr>
-  <td>waitForElementPresent</td>
-  <td>//a[@data-i18n="Home"]</td>
-  <td></td>
-</tr>
+<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
 
 
  <tr>
    <td>verifyText</td>
-   <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Home"]</td>
+   <td>//div[@data-gadget-scope='panel']//a[@class="ui-btn-icon-left ui-icon-home"]</td>
    <td>zhuye</td>
  </tr>
 
 
  <tr>
    <td>verifyText</td>
-   <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Modules"]</td>
+   <td>//div[@data-gadget-scope='panel']//a[@class="ui-btn-icon-left ui-icon-puzzle-piece"]</td>
    <td>mokuai</td>
  </tr>
  
@@ -48,28 +44,28 @@
  
   <tr>
    <td>verifyText</td>
-   <td>//div[@data-gadget-scope='panel']//a[@data-i18n="History"]</td>
+   <td>//div[@data-gadget-scope='panel']//a[@class="ui-btn-icon-left ui-icon-tasks"]</td>
    <td>lishi</td>
  </tr>
  
  
   <tr>
    <td>verifyText</td>
-   <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Search"]</td>
+   <td>//div[@data-gadget-scope='panel']//a[@class="ui-btn-icon-left ui-icon-search"]</td>
    <td>soushuo</td>
  </tr>
  
  
   <tr>
    <td>verifyText</td>
-   <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Preferences"]</td>
+   <td>//div[@data-gadget-scope='panel']//a[@class="ui-btn-icon-left ui-icon-sliders"]</td>
    <td>pianai</td>
  </tr>
  
  
   <tr>
    <td>verifyText</td>
-   <td>//div[@data-gadget-scope='panel']//a[@data-i18n="Logout"]</td>
+   <td>//div[@data-gadget-scope='panel']//a[@class="ui-btn-icon-left ui-icon-power-off"]</td>
    <td>tuichu</td>
  </tr>
 

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

@@ -440,6 +440,11 @@
       <td>//div[contains(@data-gadget-url, 'gadget_erp5_field_listbox.html')]//nav//span[contains(text(), "ecord")]</td>
       <td></td>
     </tr>
+    <tr>
+      <td>assertElementPresent</td>
+      <td>//div[contains(@data-gadget-url, 'gadget_erp5_field_listbox.html')]//nav//span[contains(text(), "ecord")]</td>
+      <td></td>
+    </tr>
     <tr>
       <td colspan="3"><p></p></td>
     </tr>