From 8324f591ff408a9d3175c7f09e259a1676cb5432 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Tue, 7 Sep 2010 07:19:31 +0000 Subject: [PATCH] Listbox uses no longer Ids but CSS classes. Adjust tests accordingly after r38122. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38161 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../testDialogDialogCategoryPropagation.xml | 9 +-- .../testFolderWorkflowAction.xml | 43 +++++++-------- ...olderWorkflowActionCheckedUidSelection.xml | 25 ++++----- .../testFolderWorkflowActionDomainTree.xml | 51 ++++++++--------- ...tFolderWorkflowActionFilteredSelection.xml | 23 ++++---- ...orkflowActionInvertModeMultipleActions.xml | 55 +++++++++---------- ...olderWorkflowActionInvertModeSelection.xml | 25 ++++----- ...estFolderWorkflowActionMultipleActions.xml | 49 ++++++++--------- .../page_templates_zuite/testSearchDialog.xml | 17 +++--- bt5/erp5_ui_test/bt/revision | 2 +- 10 files changed, 134 insertions(+), 165 deletions(-) diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogDialogCategoryPropagation.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogDialogCategoryPropagation.xml index 1a1703c471..c504968fa4 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogDialogCategoryPropagation.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogDialogCategoryPropagation.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -115,10 +112,6 @@ <key> <string>id</string> </key> <value> <string>testDialogDialogCategoryPropagation</string> </value> </item> - <item> - <key> <string>isIndexable</string> </key> - <value> <int>0</int> </value> - </item> <item> <key> <string>title</string> </key> <value> <string></string> </value> diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowAction.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowAction.xml index 3862763613..7b9ce5b3ec 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowAction.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowAction.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -96,53 +93,53 @@ Validated Foo -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>2 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n <td>2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n <td>Draft</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/select</td>\n <td>label=Validate Action</td>\n </tr>\n \n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/a</td>\n <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a</td>\n <td>Validated</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n \n @@ -163,34 +160,34 @@ Note that if a document cannot be processed, it\'s not shown in this list\n -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>2 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>2</td>\n </tr>\n <!-- This listbox is a proxy to the module listbox, so it has the same title\n and the same columns. -->\n <tr>\n <td>assertText</td>\n - <td>listbox_title</td>\n - <td>exact:Foos:</td>\n + <td>//a[@class="listbox_title"]</td>\n + <td>exact:Foos</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n <td>Title 2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n <td>Validate Action</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n <td>Title 3</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]</td>\n <td>Validate Action</td>\n </tr>\n \n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionCheckedUidSelection.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionCheckedUidSelection.xml index 0e2833841e..b343858455 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionCheckedUidSelection.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionCheckedUidSelection.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -88,7 +85,7 @@ </tr>\n <tr>\n <td>click</td>\n - <td>//tr[@id=\'listbox_data_line_2\']/td[1]/input</td>\n + <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[1]/input</td>\n <td></td>\n </tr>\n \n @@ -101,32 +98,32 @@ <!-- we have a listbox with 1 line, for 1 Draft Foo -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>1 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n <td>Draft</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/select</td>\n <td>label=Validate Action</td>\n </tr>\n \n @@ -144,8 +141,8 @@ \n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>1 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>1</td>\n </tr>\n \n <tr>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionDomainTree.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionDomainTree.xml index e5823e80f4..0bea9044a8 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionDomainTree.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionDomainTree.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -98,8 +95,8 @@ </tr>\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>3 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>3</td>\n </tr>\n \n <!-- Select elements by the domain tree -->\n @@ -110,7 +107,7 @@ </tr>\n <tr>\n <td>clickAndWait</td>\n - <td>id=listbox_domain_tree_mode</td>\n + <td>//input[@class="listbox-tree-domain-tree-mode"]</td>\n <td></td>\n </tr>\n <tr>\n @@ -120,20 +117,20 @@ </tr>\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>3 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>3</td>\n </tr>\n \n <!-- Click on the \'a\' domain tree -->\n <tr>\n <td>clickAndWait</td>\n - <td>//table[@id="listbox_domain_tree_table"]//tr[1]//a[@class="tree_closed"]</td>\n + <td>//table[@class="listbox-table-domain-tree"]//tr[1]//a[@class="tree-closed"]</td>\n <td></td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>2 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>2</td>\n </tr>\n \n <!-- Change Stat of this element list -->\n @@ -146,33 +143,33 @@ <!-- we have a listbox with 1 line for 2 Draft Foos -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>1 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>1</td>\n </tr>\n <!-- It\'s the number of element which will be validate -->\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n <td>2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n <td>Draft</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/select</td>\n <td>label=Validate Action</td>\n </tr>\n \n @@ -194,34 +191,34 @@ Note that if a document cannot be processed, it\'s not shown in this list\n <!-- List of element which will validate -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>2 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>2</td>\n </tr>\n <!-- This listbox is a proxy to the module listbox, so it has the same title\n and the same columns. -->\n <tr>\n <td>assertText</td>\n - <td>listbox_title</td>\n - <td>exact:Foos:</td>\n + <td>//a[@class="listbox_title"]</td>\n + <td>exact:Foos</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n <td>Title 2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n <td>Validate Action</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n <td>Title 3</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]</td>\n <td>Validate Action</td>\n </tr>\n <tr>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionFilteredSelection.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionFilteredSelection.xml index b23e407a0f..39e11bbfff 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionFilteredSelection.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionFilteredSelection.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -106,32 +103,32 @@ <!-- we have a listbox with 1 line, for 1 Draft Foo -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>1 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n <td>Draft</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/select</td>\n <td>label=Validate Action</td>\n </tr>\n \n @@ -149,8 +146,8 @@ \n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>1 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>1</td>\n </tr>\n \n <tr>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionInvertModeMultipleActions.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionInvertModeMultipleActions.xml index 242c975910..6cff3b892a 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionInvertModeMultipleActions.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionInvertModeMultipleActions.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -92,17 +89,17 @@ testFolderWorkflowActionInvertModeMultipleActions -->\n \n <tr>\n <td>click</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[1]/input</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/input</td>\n <td></td>\n </tr>\n <tr>\n <td>click</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[1]/input</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/input</td>\n <td></td>\n </tr>\n <tr>\n <td>click</td>\n - <td>//tr[@id=\'listbox_data_line_2\']/td[1]/input</td>\n + <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[1]/input</td>\n <td></td>\n </tr>\n <tr>\n @@ -121,58 +118,58 @@ testFolderWorkflowActionInvertModeMultipleActions -->\n Validated Foo -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>2 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n <td>2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n <td>Draft</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/select</td>\n <td>label=Validate Action</td>\n </tr>\n \n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/a</td>\n <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a</td>\n <td>Validated</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/select</td>\n <td>label=Invalidate Action</td>\n </tr>\n \n @@ -193,44 +190,44 @@ Note that if a document cannot be processed, it\'s not shown in this list\n -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>3 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>3</td>\n </tr>\n <!-- This listbox is a proxy to the module listbox, so it has the same title\n and the same columns. -->\n <tr>\n <td>assertText</td>\n - <td>listbox_title</td>\n - <td>exact:Foos:</td>\n + <td>//a[@class="listbox_title"]</td>\n + <td>exact:Foos</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n <td>Title 2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n <td>Validate Action</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n <td>Title 3</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]</td>\n <td>Validate Action</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_2\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]</td>\n <td>Title 1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_2\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]</td>\n <td>Invalidate Action</td>\n </tr>\n \n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionInvertModeSelection.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionInvertModeSelection.xml index 515ad71c9c..011fc57c79 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionInvertModeSelection.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionInvertModeSelection.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -89,7 +86,7 @@ </tr>\n <tr>\n <td>click</td>\n - <td>//tr[@id=\'listbox_data_line_2\']/td[1]/input</td>\n + <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[1]/input</td>\n <td></td>\n </tr>\n \n @@ -108,32 +105,32 @@ <!-- we have a listbox with 1 line, for 1 Draft Foo -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>1 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n <td>Draft</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/select</td>\n <td>label=Validate Action</td>\n </tr>\n \n @@ -151,8 +148,8 @@ \n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>1 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>1</td>\n </tr>\n \n <tr>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionMultipleActions.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionMultipleActions.xml index e6230d7445..91be9e04fd 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionMultipleActions.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testFolderWorkflowActionMultipleActions.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -96,58 +93,58 @@ Validated Foo -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>2 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n <td>2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n <td>Draft</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/select</td>\n <td>label=Validate Action</td>\n </tr>\n \n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[1]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/a</td>\n <td>1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n <td>Foo</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[3]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a</td>\n <td>Validated</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[4]/a</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/a</td>\n <td>Foo Workflow</td>\n </tr>\n <tr>\n <td>select</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[5]/select</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/select</td>\n <td>label=Invalidate Action</td>\n </tr>\n \n @@ -168,44 +165,44 @@ Note that if a document cannot be processed, it\'s not shown in this list\n -->\n <tr>\n <td>assertText</td>\n - <td>listbox_record_number</td>\n - <td>3 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>3</td>\n </tr>\n <!-- This listbox is a proxy to the module listbox, so it has the same title\n and the same columns. -->\n <tr>\n <td>assertText</td>\n - <td>listbox_title</td>\n - <td>exact:Foos:</td>\n + <td>//a[@class="listbox_title"]</td>\n + <td>exact:Foos</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n <td>Title 1</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n <td>Invalidate Action</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n <td>Title 2</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_1\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]</td>\n <td>Validate Action</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_2\']/td[2]</td>\n + <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]</td>\n <td>Title 3</td>\n </tr>\n <tr>\n <td>assertText</td>\n - <td>//tr[@id=\'listbox_data_line_2\']/td[4]</td>\n + <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]</td>\n <td>Validate Action</td>\n </tr>\n \n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testSearchDialog.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testSearchDialog.xml index 844e935812..8712f6d9f2 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testSearchDialog.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testSearchDialog.xml @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> - <tuple/> - </tuple> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> </pickle> <pickle> <dictionary> @@ -121,8 +118,8 @@ </tr>\n <tr>\n <td>verifyText</td>\n - <td>listbox_record_number</td>\n - <td>2 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>2</td>\n </tr>\n \n \n @@ -166,8 +163,8 @@ commands from selenium 0.8\n -->\n <tr>\n <td>verifyText</td>\n - <td>listbox_record_number</td>\n - <td>1 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>1</td>\n </tr>\n \n \n @@ -189,8 +186,8 @@ commands from selenium 0.8\n </tr>\n <tr>\n <td>verifyText</td>\n - <td>listbox_record_number</td>\n - <td>0 records</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td>0</td>\n </tr>\n \n </body>\n diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index 4af6ab79ff..316941dd7d 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -598 \ No newline at end of file +599 \ No newline at end of file -- 2.30.9