From f84b9777e7a3201711ba69c6a3d0734d97429a19 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Tue, 7 Sep 2010 11:54:04 +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@38172 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../PdmZuite_CommonTemplate.xml | 7 ++----- .../PdmZuite_checkStockBrowser.xml | 21 ++++++++----------- bt5/erp5_pdm_ui_test/bt/revision | 2 +- .../project_zuite/testSearchByStartDate.xml | 19 +++++++---------- bt5/erp5_project_ui_test/bt/revision | 2 +- 5 files changed, 21 insertions(+), 30 deletions(-) diff --git a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml index fdb3943f2b..f65f089f90 100644 --- a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml +++ b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.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> @@ -108,7 +105,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 </tal:block>\n diff --git a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.xml b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.xml index cfe1bb62d7..7fbd6078a1 100644 --- a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.xml +++ b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.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> @@ -53,8 +50,8 @@ <!-- Check inventory -->\n <tr>\n <td>verifyText</td>\n - <td>id=listbox_record_number</td>\n - <td tal:content="python: \'%s records\' % movement_count">number of record(s)</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td tal:content="python: \'%s\' % movement_count">number of record(s)</td>\n </tr>\n <tal:block tal:condition="python: movement_count != 0">\n \n @@ -65,30 +62,30 @@ ]">\n <tr>\n <td>verifyText</td>\n - <td tal:content="python: \'//tr[@id=\\\'listbox_data_line_0\\\']/td[%s]\' % inventory_tuple[1]">inventory value</td>\n + <td tal:content="python: \'//tr[@class=\\\'listbox-data-line-0 DataA\\\']/td[%s]\' % inventory_tuple[1]">inventory value</td>\n <td tal:content="python: inventory_tuple[0]">current inventory</td>\n </tr>\n <tr>\n <td>verifyText</td>\n - <td tal:content="python: \'//tr[@id=\\\'listbox_stat_line\\\']/td[%s]\' % inventory_tuple[1]">inventory value</td>\n + <td tal:content="python: \'//tr[@class=\\\'listbox_stat_line\\\']/td[%s]\' % inventory_tuple[1]">inventory value</td>\n <td tal:content="python: inventory_tuple[0]">current inventory</td>\n </tr>\n \n <!-- Check movement history list -->\n <tr>\n <td>clickAndWait</td>\n - <td tal:content="python: \'//tr[@id=\\\'listbox_data_line_0\\\']/td[%s]/a[1]\' % inventory_tuple[1]">link</td>\n + <td tal:content="python: \'//tr[@class=\\\'listbox-data-line-0 DataA\\\']/td[%s]/a[1]\' % inventory_tuple[1]">link</td>\n <td></td>\n </tr>\n <tr>\n <td>verifyText</td>\n - <td>id=listbox_record_number</td>\n - <td tal:content="python: \'%s records\' % int(abs(inventory_tuple[0]))">number of movement(s)</td>\n + <td>//span[@class="listbox-current-page-total-number"]</td>\n + <td tal:content="python: \'%s\' % int(abs(inventory_tuple[0]))">number of movement(s)</td>\n </tr>\n <!-- Go back to inventory view -->\n <tr>\n <td>clickAndWait</td>\n - <td>//a[@id="listbox_title"]</td>\n + <td>//a[@class="listbox_title"]</td>\n <td></td>\n </tr>\n </tal:block>\n diff --git a/bt5/erp5_pdm_ui_test/bt/revision b/bt5/erp5_pdm_ui_test/bt/revision index 410b14d2ce..978b4e8e51 100644 --- a/bt5/erp5_pdm_ui_test/bt/revision +++ b/bt5/erp5_pdm_ui_test/bt/revision @@ -1 +1 @@ -25 \ No newline at end of file +26 \ No newline at end of file diff --git a/bt5/erp5_project_ui_test/PathTemplateItem/portal_tests/project_zuite/testSearchByStartDate.xml b/bt5/erp5_project_ui_test/PathTemplateItem/portal_tests/project_zuite/testSearchByStartDate.xml index 950cadef7a..05ad1033db 100644 --- a/bt5/erp5_project_ui_test/PathTemplateItem/portal_tests/project_zuite/testSearchByStartDate.xml +++ b/bt5/erp5_project_ui_test/PathTemplateItem/portal_tests/project_zuite/testSearchByStartDate.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> @@ -56,17 +53,17 @@ Test quick search on the project module.\n \n <tr>\n <td>verifyEditable</td>\n - <td>//tr[@id="listbox_search_line"]/td[6]//input</td>\n + <td>//tr[@class="listbox-search-line"]/th[6]//input</td>\n <td></td>\n </tr>\n <tr>\n <td>verifyValue</td>\n - <td>//tr[@id="listbox_search_line"]/td[6]//input</td>\n + <td>//tr[@class="listbox-search-line"]/th[6]//input</td>\n <td></td>\n </tr>\n <tr>\n <td>type</td>\n - <td>//tr[@id="listbox_search_line"]/td[6]//input</td>\n + <td>//tr[@class="listbox-search-line"]/th[6]//input</td>\n <td>>=2010/03/01</td>\n </tr>\n <tr>\n @@ -76,22 +73,22 @@ Test quick search on the project module.\n </tr>\n <tr>\n <td>verifyEditable</td>\n - <td>//tr[@id="listbox_search_line"]/td[6]//input</td>\n + <td>//tr[@class="listbox-search-line"]/th[6]//input</td>\n <td></td>\n </tr>\n <tr>\n <td>verifyValue</td>\n - <td>//tr[@id="listbox_search_line"]/td[6]//input</td>\n + <td>//tr[@class="listbox-search-line"]/th[6]//input</td>\n <td>>=2010/03/01</td>\n </tr>\n <tr>\n <td>verifyText</td>\n - <td>//tr[@id="listbox_data_line_0"]/td[6]</td>\n + <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]</td>\n <td>2010/03/01</td>\n </tr>\n <tr>\n <td>verifyElementNotPresent</td>\n - <td>id=listbox_data_line_1</td>\n + <td>//tr[@class=\'listbox-data-line-1 DataB\']</td>\n <td></td>\n </tr>\n \n diff --git a/bt5/erp5_project_ui_test/bt/revision b/bt5/erp5_project_ui_test/bt/revision index bf0d87ab1b..7813681f5b 100644 --- a/bt5/erp5_project_ui_test/bt/revision +++ b/bt5/erp5_project_ui_test/bt/revision @@ -1 +1 @@ -4 \ No newline at end of file +5 \ No newline at end of file -- 2.30.9