update erp5_ui_test so as to support both xhtml style and mobile stile.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26947 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/ListBox_asHTML.xml

@@ -135,6 +135,9 @@
 \t        <span id="listbox_record_number"\n
                   tal:attributes="id string:${field_id}_record_number"\n
                   i18n:translate="" i18n:domain="ui"><tal:block tal:replace="here/total_size" i18n:name="number">0</tal:block> record(s)</span>\n
+          <span id="listbox_item_number"\n
+                  tal:attributes="id string:${field_id}_item_number; class string:listbox_item_number"\n
+                  i18n:translate="" i18n:domain="ui"> - <tal:block tal:replace="python: len(here.getCheckedUidList())" i18n:name="number">0</tal:block> item(s) selected</span>\n
                  <input type="hidden" tal:attributes="id string:${field_id}_listMax; name string:${field_id}_listMax; value python: len(search_value_list)">\n
                  <input type="hidden" tal:attributes="id string:${field_id}_itemMax; name string:${field_id}_itemMax; value python: len(line_list)">\n
                  <br />\n
@@ -152,6 +155,25 @@
                                     value python: p * lines"\n
                     i18n:domain="ui" i18n:translate=""><tal:block tal:replace="python: p + 1" i18n:name="page">0</tal:block> of <tal:block tal:replace="here/total_pages" i18n:name="total_pages">1</tal:block></option>\n
                 </select>\n
+                <span style="float:right; text-align: right;"><!-- class="navigation_buttons" -->\n
+                  <input tal:condition="python: here.current_page > 0"\n
+                         id="listbox_previous_page" type="image" src="1leftarrowv.png"\n
+                         title="Previous Page" name="previousPage:method"\n
+                         tal:attributes="id string:${field_id}_previous_page;\n
+                         name string:${field_id}_previousPage:method;\n
+                         src string:${portal_url_string}/images/1leftarrowv.png;\n
+                         class string:listbox_previous_page"\n
+                         i18n:domain="ui" i18n:attributes="title" />\n
+\n
+                   <input tal:condition="python: here.current_page < here.total_pages - 1"\n
+                          id="listbox_next_page" type="image" src="1rightarrowv.png"\n
+                          title="Next Page" name="nextPage:method"\n
+                          tal:attributes="id string:${field_id}_next_page;\n
+                          name string:${field_id}_nextPage:method;\n
+                          src string:${portal_url_string}/images/1rightarrowv.png;\n
+                          class string:listbox_next_page"\n
+                          i18n:domain="ui" i18n:attributes="title" />&nbsp;&nbsp;\n
+                </span>\n
 \n
             </div>\n
           </div>\n
@@ -211,6 +233,7 @@
                     <input type="hidden" value="0" id="search_value_list_count"\n
                            tal:attributes="value python: len(search_value_list)" />\n
 \n
+                    <input id="listbox_select" class="listbox_select" type="image" name="Base_doSelect:method" alt="Action" title="Action" tal:attributes="src string:${portal_url_string}/images/exec16.png"/>\n
                   <tal:block tal:condition="show_search_line"\n
                              tal:repeat="value search_value_list">\n
                      <div tal:condition="python: value[0]"\n
@@ -223,7 +246,7 @@
                         <tal:block tal:condition="python: search_field is not None"\n
                                    tal:replace="structure python: search_field.render(value = param, key = alias)" />\n
                         <input style="width: 40%;" name="id" size="8" value=""\n
-                               tal:attributes="name alias; value param; id python: \'%s%s\' % (\'input\', foo)"/>\n
+                               tal:attributes="name alias; value param; id python: \'%s%s\' % (\'input\', foo)" type="text"/>\n
                        </span>\n
                     </div>\n
                   </tal:block>\n
@@ -267,7 +290,7 @@
                        <input tal:condition="python: not form_id==\'Base_viewWorkflowHistory\' and line.getObject() is not None"  type="checkbox" value="checked" id="listbox_cb_1" name="uids:list"\n
                               tal:attributes="checked python: line.getUid() in checked_uid_set;\n
                                               value line/getUid; id string:${field_id}_cb_${line/getUid}" />\n
-                       <a tal:condition="python: not form_id==\'Base_viewWorkflowHistory\'" href="#"  tal:attributes="href string:${object_url}?selection_index=${selection_index}&amp;selection_name=${selection_name}&amp;ignore_layout:int=0&amp;reset:int=1"><img src="document_icon.gif" tal:attributes="src string:${portal_url_string}/images/line_clickable.png; title python: line.getObject().getRelativeUrl()" title="document" i18n:translate="" i18n:domain="ui"/></a>\n
+                       <a tal:condition="python: not form_id==\'Base_viewWorkflowHistory\'" href="#"  tal:attributes="href string:${object_url}?selection_index=${selection_index}&amp;selection_name=${selection_name}&amp;ignore_layout:int=0&amp;reset:int=1; title python: line.getObject().getRelativeUrl()"><img src="document_icon.gif" tal:attributes="src string:${portal_url_string}/images/line_clickable.png" i18n:translate="" i18n:domain="ui"/></a>\n
                       <span tal:condition="original_value" tal:replace="structure html">value</span>\n
                   </div>\n
                    <div tal:attributes="id python: \'%s_%s%s%s\' % (field_id, foo2, \'data\', foo)">\n

bt5/erp5_mobile/SkinTemplateItem/portal_skins/erp5_mobile_ui/erp5.css.xml

@@ -955,11 +955,13 @@ fieldset {\n
 #actions button .image{\n
   background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url()">/images/exec16.png\');\n
   position: relative;\n
+  top: -10px;\n
   background-repeat: no-repeat;\n
 }\n
 #jump button .image {\n
   background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url()">/images/jump.png\');\n
   position: relative;\n
+  top: -10px;\n
   background-repeat: no-repeat;\n
 }\n
 \n
@@ -1050,6 +1052,11 @@ fieldset {\n
   background-image: url(\'<dtml-var expr="portal_url.getPortalObject().absolute_url()">/images/sort.png\');\n
 }\n
 \n
+#navigation_buttons {\n
+text-align: right;\n
+float: right\n
+}\n
+\n
 #navigation_bar button .image,\n
 #context_bar button .image,\n
 .dialog_selector button .image,\n

bt5/erp5_mobile/bt/revision

-44
+45
\ No newline at end of file

bt5/erp5_mobile_ui_test/SkinTemplateItem/portal_skins/erp5_mobile_ui_test/Zuite_CommonTemplate.xml

@@ -70,6 +70,14 @@
       <td></td>\n
     </tr>\n
   </tal:block>\n
+\n
+  <tal:block metal:define-macro="goToFrontPage">\n
+   <tr>\n
+    <td>open</td>\n
+    <td>${base_url}/view</td>\n
+    <td></td>\n
+   </tr>\n
+  </tal:block>\n
 </tal:block>\n
 
 

bt5/erp5_mobile_ui_test/bt/revision

-1
+2
\ No newline at end of file

bt5/erp5_ui_test/PathTemplateItem/portal_tests/access_tab_zuite/testAccessTabPreference.xml

@@ -135,9 +135,16 @@
 </tr>\n
 <!-- Asserts goes here -->\n
 <tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
   <td>assertText</td>\n
   <td>//div[@class="index_html"]/h2</td>\n
   <td>Welcome to ERP5</td>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+   <td>assertText</td>\n
+   <td>//div[@class="title_index"]/span</td>\n
+   <td>ERP5</td>\n
+</tal:block>\n
 </tr>\n
 <tr>\n
   <td>open</td>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/business_template_zuite/testDependenciesHandling.xml

@@ -51,6 +51,7 @@
 <tr><td rowspan="1" colspan="3">Test Dependency Handling</td></tr>\n
 </thead><tbody>\n
 <tal:block metal:use-macro="here/BTZuite_CommonTemplate/macros/init" />\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>open</td>\n
   <td>${base_url}/portal_templates/TemplateTool_viewUpdateRepositoryBusinessTemplateListDialog?dialog_category=object_exchange&cancel_url=http%3A//127.0.0.1%3A9080/erp5/portal_templates/&selection_index:int=0&form_id=TemplateTool_viewBusinessTemplateList&selection_name=business_template_selection</td>\n
@@ -201,6 +202,7 @@
   <td>Reset Successfully.</td>\n
   <td></td>\n
 </tr>\n
+</tal:block>\n
 </body>\n
 </html>\n
 

bt5/erp5_ui_test/PathTemplateItem/portal_tests/business_template_zuite/testInstallFormRepositoryDialogCategoryPropagation.xml

@@ -50,6 +50,7 @@
 <thead>\n
 <tr><td rowspan="1" colspan="3">Check that the script used to reset the selection for install from repository dialog transmits correctly the dialog_category.</td></tr>\n
 </thead><tbody>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>open</td>\n
   <td tal:content="here/portal_url"></td>\n
@@ -80,6 +81,7 @@
   <td>//input[@name=\'dialog_category\' and @value=\'object_exchange\']</td>\n
   <td></td>\n
 </tr>\n
+</tal:block>\n
 </tbody></table>\n
 </body>\n
 </html>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/business_template_zuite/testUpdateFromSvn.xml

@@ -52,6 +52,8 @@
       must have checkout a copy of test_core in your svn dir)</td></tr>\n
 </thead><tbody>\n
 <tal:block metal:use-macro="here/BTZuite_CommonTemplate/macros/init" />\n
+\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>open</td>\n
   <td>${base_url}/portal_templates/TemplateTool_viewUpdateRepositoryBusinessTemplateListDialog</td>\n
@@ -142,6 +144,7 @@
   <td>Reset Successfully.</td>\n
   <td></td>\n
 </tr>\n
+</tal:block>\n
 </body>\n
 </html>\n
 

bt5/erp5_ui_test/PathTemplateItem/portal_tests/check_box_field_zuite/testSimpleCheckBoxField.xml

@@ -78,7 +78,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>link=Title 0</td>\n
+  <td>link=0</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml

@@ -78,7 +78,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>link=Title 0</td>\n
+  <td>link=0</td>\n
   <td></td>\n
 </tr>\n
 <!-- check that we have prev & next buttons for selection -->\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml

@@ -78,7 +78,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>link=Title 0</td>\n
+  <td>link=0</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml

@@ -88,11 +88,30 @@
   <td tal:content="string: ${here/portal_url}/foo_module/FooModule_viewSearchDialog?dialog_category=object_search">/erp5/foo_module/foo_module/FooModule_viewSearchDialog?dialog_category=object_search</td>\n
   <td></td>\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>select</td>\n
   <td>select_language</td>\n
   <td>label=English</td>\n
+<tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+  <td>open</td>\n
+  <td tal:content="string: ${here/portal_url}/view">erp5/view</td>\n
+  <td></td>\n
 </tr>\n
+<tr>\n
+  <td>select</td>\n
+  <td>select_language</td>\n
+  <td>label=English</td>\n
+</tr>\n
+<tr>\n
+  <td>open</td>\n
+  <td tal:content="string: ${here/portal_url}/foo_module/FooModule_viewSearchDialog?dialog_category=object_search">/erp5/foo_module/foo_module/FooModule_viewSearchDialog?dialog_category=object_search</td>\n
+  <td></td>\n
+</tr>\n
+</tal:block>\n
 <tr>\n
   <td>verifyElementNotPresent</td>\n
   <td>//select[@id="dialog_selector"]</td>\n
@@ -125,31 +144,84 @@
   <td>dialog_submit_button</td>\n
   <td>Search Foos</td>\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
+<tr>\n
+  <td>selectAndWait</td>\n
+  <td>select_language</td>\n
+  <td>label=Wolof</td>\n
+</tr>\n
+<tr>\n
+  <td>verifyValue</td>\n
+  <td>dialog_submit_button</td>\n
+  <td>Seet Foos</td>\n
+</tr>\n
+<tr>\n
+  <td>selectAndWait</td>\n
+  <td>select_language</td>\n
+  <td>label=Xhosa</td>\n
+</tr>\n
+<tr>\n
+  <td>verifyValue</td>\n
+  <td>dialog_submit_button</td>\n
+  <td>Searching Foos</td>\n
+</tr>\n
 <tr>\n
+  <td>select</td>\n
+  <td>select_language</td>\n
+  <td>label=English</td>\n
+</tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+  <td>open</td>\n
+  <td tal:content="string: ${here/portal_url}/view">erp5/view</td>\n
+  <td></td>\n
+</tr>\n
   <td>selectAndWait</td>\n
   <td>select_language</td>\n
   <td>label=Wolof</td>\n
+<tr>\n
+<tr>\n
+  <td>open</td>\n
+  <td tal:content="string: ${here/portal_url}/foo_module/FooModule_viewSearchDialog?dialog_category=object_search">/erp5/foo_module/foo_module/FooModule_viewSearchDialog?dialog_category=object_search</td>\n
+  <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
   <td>dialog_submit_button</td>\n
   <td>Seet Foos</td>\n
 </tr>\n
+<tr>\n
+  <td>open</td>\n
+  <td tal:content="string: ${here/portal_url}/view">erp5/view</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>selectAndWait</td>\n
   <td>select_language</td>\n
   <td>label=Xhosa</td>\n
 </tr>\n
+<tr>\n
+  <td>open</td>\n
+  <td tal:content="string: ${here/portal_url}/foo_module/FooModule_viewSearchDialog?dialog_category=object_search">/erp5/foo_module/foo_module/FooModule_viewSearchDialog?dialog_category=object_search</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>verifyValue</td>\n
   <td>dialog_submit_button</td>\n
   <td>Searching Foos</td>\n
 </tr>\n
+<tr>\n
+  <td>open</td>\n
+  <td tal:content="string: ${here/portal_url}/view">erp5/view</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>select</td>\n
   <td>select_language</td>\n
   <td>label=English</td>\n
 </tr>\n
+</tal:block>\n
 \n
 \n
 </body>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml

@@ -129,7 +129,8 @@
   <td>4 record(s)</td> <!-- Creation + edited 3 times -->\n
 </tr>\n
 \n
-<!-- First modification --> \n
+<!-- First modification -->\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//tr[@id=\'x0_listbox_data_line_1\']/td[4]/a</td>\n
@@ -140,11 +141,30 @@
   <td>Historical Comparison - Version 3*</td>\n
   <td></td>\n
 </tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+  <td>click</td>\n
+  <td>//span[@id=\'x0_listbox_check\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <td>clickAndWait</td>\n
+  <td>//div[@id=\'x0_listbox_data_line_1\']//a</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <td>assertText</td>\n
+  <td>//div[@class=\'title_index\']/a[3]</td>\n
+  <td>Version 3</td>\n
+</tr>\n
+</tal:block>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>listbox_record_number</td>\n
   <td>1 record(s)</td> <!-- Only one property changed. -->\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>assertText</td>\n
   <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
@@ -165,18 +185,35 @@
   <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
   <td>Version 3</td> <!-- now -->\n
 </tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
 \n
+</tal:block>\n
 <!-- Second modification -->\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>link=History</td>\n
   <td></td>\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
-  <td>clickAndWait</td>\n
+<td>clickAndWait</td>\n
   <td>//tr[@id=\'x0_listbox_data_line_2\']/td[4]/a</td>\n
   <td></td>\n
 </tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+  <td>click</td>\n
+  <td>//span[@id=\'x0_listbox_check\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <td>clickAndWait</td>\n
+  <td>//div[@id=\'x0_listbox_data_line_2\']//a</td>\n
+  <td></td>\n
+</tr>\n
+</tal:block>\n
 <tr>\n
   <td>assertTitle</td>\n
   <td>Historical Comparison - Version 3*</td>\n
@@ -187,6 +224,7 @@
   <td>listbox_record_number</td>\n
   <td>1 record(s)</td> <!-- Only one property changed. -->\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>assertText</td>\n
   <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
@@ -207,6 +245,10 @@
   <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
   <td>Version 3</td> <!-- now -->\n
 </tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+\n
+</tal:block>\n
 <!-- Jump to old revision -->\n
 <tr>\n
   <td>clickAndWait</td>\n
@@ -231,11 +273,25 @@
   <td>link=History</td> <!-- even if we show an old version  -->\n
   <td></td>             <!-- all links points to current version -->\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//tr[@id=\'x0_listbox_data_line_3\']/td[4]/a</td>\n
   <td></td>\n
 </tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+  <td>click</td>\n
+  <td>//span[@id=\'x0_listbox_check\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <td>clickAndWait</td>\n
+  <td>//div[@id=\'x0_listbox_data_line_3\']//a</td>\n
+  <td></td>\n
+</tr>\n
+</tal:block>\n
 <tr>\n
   <td>assertTitle</td>\n
   <td>Historical Comparison - Version 3*</td>\n
@@ -246,6 +302,7 @@
   <td>listbox_record_number</td>\n
   <td>1 record(s)</td> <!-- Only one property changed. -->\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>assertText</td>\n
   <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
@@ -266,7 +323,10 @@
   <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
   <td>Version 3</td> <!-- now -->\n
 </tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
 \n
+</tal:block>\n
 </tbody></table>\n
 </body>\n
 </html>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml

@@ -78,7 +78,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>link=Title 0</td>\n
+  <td>link=0</td>\n
   <td></td>\n
 </tr>\n
 <!-- check that we have prev & next buttons for selection -->\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml

@@ -101,6 +101,7 @@
   <td>document.forms[0].elements[\'Base_callDialogMethod:method\'][1]</td>\n
   <td></td>\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>verifyValue</td>\n
   <td>//tr[@id="listbox_search_line"]/td[2]//input</td>\n
@@ -111,6 +112,20 @@
   <td>//tr[@id="listbox_search_line"]/td[3]//input</td>\n
   <td>title_value</td>\n
 </tr>\n
+</tal:block>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+<tr>\n
+  <td>verifyValue</td>\n
+  <td>//div[@id="0"]//input</td>\n
+  <td>id_value</td>\n
+</tr>\n
+<tr>\n
+  <td>verifyValue</td>\n
+  <td>//div[@id="1"]//input</td>\n
+  <td>title_value</td>\n
+</tr>\n
+</tal:block>\n
+\n
 <tr>\n
   <td>open</td>\n
   <td tal:content="string: ${here/portal_url}/portal_types/Foo%20Module/PortalType_deleteAction?id=generic_search">Delete Folder_viewSearchDialog action if exists.</td>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml

@@ -78,7 +78,7 @@
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>link=Title 2</td>\n
+  <td>link=2</td>\n
   <td></td>\n
 </tr>\n
 <!-- Prev / Next -->\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml

@@ -79,7 +79,7 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>link=Title 1</td>\n
+  <td>link=1</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml

@@ -111,6 +111,11 @@
   <td>${base_url}/foo_module/view</td>\n
   <td></td>\n
 </tr>\n
+\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+  <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/goToFrontPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>selectAndWait</td>\n
   <td>select_favorite</td>\n
@@ -123,9 +128,14 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
   <td>1</td>\n
 </tr>\n
+\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+  <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/goToFrontPage" />\n
+</tal:block>\n
+\n
 <tr>\n
   <td>selectAndWait</td>\n
   <td>select_favorite</td>\n
@@ -138,7 +148,7 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
   <td>0</td>\n
 </tr>\n
 \n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/float_field_zuite/testFloatField.xml

@@ -93,7 +93,7 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//fieldset[@id="fieldset_right"]/div[2]//div</td>\n
+  <td>//fieldset[@id="fieldset_right"]//div[@class="field"][2]//div</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
@@ -118,7 +118,7 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//fieldset[@id="fieldset_right"]/div[2]//div</td>\n
+  <td>//fieldset[@id="fieldset_right"]//div[@class="field"][2]//div</td>\n
   <td>1 000 000 000 000.0</td>\n
 </tr>\n
 </tbody></table>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/integer_field_zuite/testFloatValue.xml

@@ -93,7 +93,7 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//fieldset[@id="fieldset_left"]/div[2]//span</td>\n
+  <td>//fieldset[@id="fieldset_left"]//span[@class="foo"]</td>\n
   <td>10</td>\n
 </tr>\n
 \n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/lines_field_zuite/testDialogLinesField.xml

@@ -62,11 +62,13 @@
   <td>foo\n
 bar</td>\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@title=\'Title\']</td>\n
   <td></td>\n
 </tr>\n
+</tal:block>\n
 <tr>\n
   <td>assertValue</td>\n
   <td>//textarea[@name=\'field_my_lines_list\']</td>\n
@@ -94,11 +96,13 @@ bar</td>\n
   <td>//textarea[@name=\'field_my_lines_list\']</td>\n
   <td>foo bar</td>\n
 </tr>\n
+<tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@title=\'Title\']</td>\n
   <td></td>\n
 </tr>\n
+</tal:block>\n
 <tr>\n
   <td>assertValue</td>\n
   <td>//textarea[@name=\'field_my_lines_list\']</td>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_dialog_mode_zuite/testPager.xml

@@ -79,17 +79,17 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_1"]//a[not(@title)][1]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_2"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_2"]//a[not(@title)][1]</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n
@@ -151,17 +151,17 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_1"]//a[not(@title)][1]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_2"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_2"]//a[not(@title)][1]</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n
@@ -213,17 +213,17 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
   <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_1"]//a[not(@title)][1]</td>\n
   <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_2"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_2"]//a[not(@title)][1]</td>\n
   <td>5</td>\n
 </tr>\n
 <tr>\n
@@ -257,17 +257,17 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_1"]//a[not(@title)][1]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_2"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_2"]//a[not(@title)][1]</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n
@@ -320,7 +320,7 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
   <td>9</td>\n
 </tr>\n
 <tr>\n
@@ -362,17 +362,17 @@
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+ <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_1"]//a[not(@title)][1]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id="listbox_data_line_2"]/td[2]</td>\n
+  <td>//*[@id="listbox_data_line_2"]//a[not(@title)][1]</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n

bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_dialog_mode_zuite/testQuickSearch.xml

@@ -53,16 +53,29 @@
 <tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/init" />\n
 <!-- Search by id -->\n
 <tr>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
   <td>type</td>\n
   <td>//tr[@id="listbox_search_line"]/td[2]//input</td>\n
   <td>1</td>\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+  <td>type</td>\n
+  <td>//div[@id="listbox_search_line"]//input[@id="input0"]</td>\n
+  <td>1</td>\n
+ </tal:block>\n
+</tr>\n
+<!--\n
+<tr>\n
+  <td>type</td>\n
+  <td>//*[@id="listbox_search_line"]//input[@id="input0"]</td>\n
+  <td>1</td>\n
 </tr>\n
+-->\n
 <tr>\n
  <td>clickAndWait</td>\n
  <td>Base_doSelect:method</td>\n
  <td></td>\n
 </tr>\n
-\n
 <tr>\n
   <td>assertTextPresent</td>\n
   <td>Useless Field In Bar Selection Dialog</td>\n
@@ -75,15 +88,27 @@
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[1]//input</td>\n
+  <td>//*[@id=\'listbox_data_line_0\']//input[@type="checkbox"]</td>\n
   <td>on</td>\n
 </tr>\n
-\n
-\n
+<!--\n
 <tr>\n
+  <td>verifyValue</td>\n
+  <td>//*[@id="listbox_search_line"]//input[contains(style(),"inline")]</td>\n
+  <td>1</td>\n
+</tr>\n
+-->\n
+<tr>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n
   <td>verifyValue</td>\n
   <td>//tr[@id="listbox_search_line"]/td[2]//input</td>\n
   <td>1</td>\n
+ </tal:block>\n
+ <tal:block tal:condition="python: context.TestTool_getSkinName()==\'Mobile\'">\n
+  <td>verifyValue</td>\n
+  <td>//div[@id="listbox_search_line"]//input[@id="input0"]</td>\n
+  <td>1</td>\n
+ </tal:block>\n
 </tr>\n
 \n
 <tr>\n

bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxDialogModeZuite_CommonTemplate.xml

@@ -116,17 +116,17 @@
     <tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/goto_dialog" />\n
     <tr>\n
       <td>verifyText</td>\n
-      <td>//tr[@id="listbox_data_line_0"]/td[2]</td>\n
+      <td>//*[@id="listbox_data_line_0"]//a[not(@title)][1]</td>\n
       <td>0</td>\n
     </tr>\n
     <tr>\n
       <td>verifyText</td>\n
-      <td>//tr[@id="listbox_data_line_1"]/td[2]</td>\n
+      <td>//*[@id="listbox_data_line_1"]//a[not(@title)][1]</td>\n
       <td>1</td>\n
     </tr>\n
     <tr>\n
       <td>verifyText</td>\n
-      <td>//tr[@id="listbox_data_line_2"]/td[2]</td>\n
+      <td>//*[@id="listbox_data_line_2"]//a[not(@title)][1]</td>\n
       <td>2</td>\n
     </tr>\n
     <tr>\n
@@ -169,7 +169,7 @@
 \n
   <tr>\n
     <td>click</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[1]/input</td>\n
+    <td>//*[@id=\'listbox_data_line_1\']//input[@type="checkbox"]</td>\n
     <td></td>\n
   </tr>\n
     <tal:block metal:use-macro="here/ListBoxDialogModeZuite_CommonTemplate/macros/verify_dialog" />\n
@@ -190,9 +190,9 @@
   <td>Hardcoded text value</td>\n
 </tr>\n
 <tr>\n
-\t<td>verifyValue</td>\n
-\t<td>//tr[@id="listbox_data_line_1"]/td[1]//input</td>\n
-\t<td>on</td>\n
+  <td>verifyValue</td>\n
+  <td>//*[@id="listbox_data_line_1"]//input[@type="checkbox"]</td>\n
+  <td>on</td>\n
 </tr>\n
 \n
   </tal:block>\n

bt5/erp5_ui_test/bt/revision

-432
+433
\ No newline at end of file