diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml index 06f719d321411b8802dcae22bddcd0b0f4b25647..20cd9ec9804dcd19dd8156db66392bc309bd1f71 100644 --- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml +++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml @@ -86,7 +86,7 @@ Grouping from account transaction view\n <td>//label[contains(text(),"Total Selected Amount")]/../div[1]/</td>\n <td>0.00</td>\n </tr>\n -<tr tal:condition="is_selenium_0_8">\n +<tr>\n <td>verifySelectedLabel</td>\n <td>field_your_node</td>\n <td>41 - Receivable</td>\n @@ -243,7 +243,7 @@ Grouping from account transaction view\n <td>on</td>\n </tr>\n \n -<tr tal:condition="is_selenium_0_8">\n +<tr>\n <td>verifySelectedLabel</td>\n <td>field_your_node</td>\n <td>41 - Receivable</td>\n diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml index b299d6ab03be402217734d454a6b0ffbaf23ff10..0db139e62eb4b1f25600c154ad88ed2ad2409042 100644 --- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml +++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml @@ -97,7 +97,7 @@ Grouping from entity transaction view\n <td>//label[contains(text(),"Total Selected Amount")]/../div[1]/</td>\n <td>0.00</td>\n </tr>\n -<tr tal:condition="is_selenium_0_8">\n +<tr>\n <td>verifySelectedLabel</td>\n <td>field_your_node</td>\n <td></td>\n @@ -226,7 +226,7 @@ Grouping from entity transaction view\n <td>on</td>\n </tr>\n \n -<tr tal:condition="is_selenium_0_8">\n +<tr>\n <td>verifySelectedLabel</td>\n <td>field_your_node</td>\n <td>41 - Receivable</td>\n diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml index db8bd276d7182db74d0a00d0111ec70b9b52081c..070ddd650b6a9ca6948eb246f62c29222867c3a7 100644 --- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml +++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml @@ -97,7 +97,7 @@ Grouping with multiple pages\n <td>//label[contains(text(),"Total Selected Amount")]/../div[1]/</td>\n <td>0.00</td>\n </tr>\n -<tr tal:condition="is_selenium_0_8">\n +<tr>\n <td>verifySelectedLabel</td>\n <td>field_your_node</td>\n <td></td>\n @@ -236,7 +236,7 @@ Grouping with multiple pages\n <td>on</td>\n </tr>\n \n -<tr tal:condition="is_selenium_0_8">\n +<tr>\n <td>verifySelectedLabel</td>\n <td>field_your_node</td>\n <td>41 - Receivable</td>\n diff --git a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml index b7eeac0160abbd1d102e733811cb57b3dcecf516..e1b9cd9722dc33e0cc6dbbb0cc5a458c1728f320 100644 --- a/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml +++ b/bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml @@ -41,10 +41,9 @@ <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n - <tal:block metal:define-macro="init"\n - tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n + <tal:block metal:define-macro="init">\n <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n - <tr tal:condition="is_selenium_0_8">\n + <tr>\n <td>setTimeout</td>\n <td>600000</td>\n <td></td>\n diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision index b912dc118c6d152c61ec7a6dd1962596853bc8f7..34bba940d19c5c03f8a0d63433cba1cf420f1d71 100644 --- a/bt5/erp5_accounting_ui_test/bt/revision +++ b/bt5/erp5_accounting_ui_test/bt/revision @@ -1 +1 @@ -155 \ No newline at end of file +156 \ No newline at end of file diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_internal_supply_line_price_quantity_step.xml b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_internal_supply_line_price_quantity_step.xml index d47573a58e7ca89a883b61fa2850793297ae5c2a..6d6afc0a5ed549a025e2002c14fa12a6201d8352 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_internal_supply_line_price_quantity_step.xml +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_internal_supply_line_price_quantity_step.xml @@ -62,13 +62,7 @@ Test quantity steps for price on internal supply line\n <tr>\n <td>type</td>\n <td>field_my_internal_supply_line_quantity_step_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>10<br />20</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>10\n -20</td>\n -</tal:block>\n </tr>\n <tr>\n <td>clickAndWait</td>\n @@ -141,13 +135,7 @@ Test quantity steps for price on internal supply line\n <tr>\n <td>type</td>\n <td>field_my_internal_supply_line_quantity_step_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>foo<br />bar</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>foo\n -bar</td>\n -</tal:block>\n </tr>\n <tr>\n <td>clickAndWait</td>\n diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml index 6a9b85766924782dcfc33d5faef4d84ce02610ff..e1d32c5d149f906caf551fb69328b86dc84e2bfb 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml @@ -62,13 +62,7 @@ Test quantity steps for price on purchase supply line\n <tr>\n <td>type</td>\n <td>field_my_purchase_supply_line_quantity_step_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>10<br />20</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>10\n -20</td>\n -</tal:block>\n </tr>\n <tr>\n <td>clickAndWait</td>\n @@ -141,13 +135,7 @@ Test quantity steps for price on purchase supply line\n <tr>\n <td>type</td>\n <td>field_my_purchase_supply_line_quantity_step_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>foo<br />bar</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>foo\n -bar</td>\n -</tal:block>\n </tr>\n <tr>\n <td>clickAndWait</td>\n diff --git a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml index 02cf36b22be3e5583d6738f8dc2336c433a4c2c6..596cce24de33de8a13cfa0725d8b70590bd73a3e 100644 --- a/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml +++ b/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml @@ -62,13 +62,7 @@ Test quantity steps for price on sale supply line\n <tr>\n <td>type</td>\n <td>field_my_sale_supply_line_quantity_step_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>10<br />20</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>10\n -20</td>\n -</tal:block>\n </tr>\n <tr>\n <td>clickAndWait</td>\n @@ -141,13 +135,7 @@ Test quantity steps for price on sale supply line\n <tr>\n <td>type</td>\n <td>field_my_sale_supply_line_quantity_step_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>foo<br />bar</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>foo\n -bar</td>\n -</tal:block>\n </tr>\n <tr>\n <td>clickAndWait</td>\n 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 21778ce936f983864c37664146636ad8ad401611..fdb3943f2bdf34f9254af752f214bec6e767612f 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 @@ -41,10 +41,9 @@ <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n - <tal:block metal:define-macro="init"\n - tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n + <tal:block metal:define-macro="init">\n <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n - <tr tal:condition="is_selenium_0_8">\n + <tr>\n <td>setTimeout</td>\n <td>600000</td>\n <td></td>\n diff --git a/bt5/erp5_pdm_ui_test/bt/revision b/bt5/erp5_pdm_ui_test/bt/revision index b5045cc4046dbc1d7cafa4c603fd3cdf35dc5dde..b39356075901abfb43d27aef2ae5b76b6aee19c4 100644 --- a/bt5/erp5_pdm_ui_test/bt/revision +++ b/bt5/erp5_pdm_ui_test/bt/revision @@ -1 +1 @@ -21 \ No newline at end of file +23 \ No newline at end of file diff --git a/bt5/erp5_project_ui_test/SkinTemplateItem/portal_skins/erp5_project_ui_test/Zuite_CommonTemplateForProjectZuite.xml b/bt5/erp5_project_ui_test/SkinTemplateItem/portal_skins/erp5_project_ui_test/Zuite_CommonTemplateForProjectZuite.xml index a9c5c1f4781cf9281b9ea2592ec4110ca4cc20e9..eb77ab10145b503cd9e5919fccbd99289e8486ea 100644 --- a/bt5/erp5_project_ui_test/SkinTemplateItem/portal_skins/erp5_project_ui_test/Zuite_CommonTemplateForProjectZuite.xml +++ b/bt5/erp5_project_ui_test/SkinTemplateItem/portal_skins/erp5_project_ui_test/Zuite_CommonTemplateForProjectZuite.xml @@ -41,10 +41,9 @@ <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n - <tal:block metal:define-macro="init"\n - tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n + <tal:block metal:define-macro="init">\n <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n - <tr tal:condition="is_selenium_0_8">\n + <tr>\n <td>setTimeout</td>\n <td>600000</td>\n <td></td>\n diff --git a/bt5/erp5_project_ui_test/bt/revision b/bt5/erp5_project_ui_test/bt/revision index e440e5c842586965a7fb77deda2eca68612b1f53..bf0d87ab1b2b0ec1a11a3973d2845b42413d9767 100644 --- a/bt5/erp5_project_ui_test/bt/revision +++ b/bt5/erp5_project_ui_test/bt/revision @@ -1 +1 @@ -3 \ No newline at end of file +4 \ No newline at end of file diff --git a/bt5/erp5_trade_ui_test/SkinTemplateItem/portal_skins/erp5_trade_ui_test/Zuite_CommonTemplateForTradeZuite.xml b/bt5/erp5_trade_ui_test/SkinTemplateItem/portal_skins/erp5_trade_ui_test/Zuite_CommonTemplateForTradeZuite.xml index 80217f030ad676e2a8c8320c2f04e3288e8d54cf..aa4a13feace401be5e8fa45b2263cbcac5e2d186 100644 --- a/bt5/erp5_trade_ui_test/SkinTemplateItem/portal_skins/erp5_trade_ui_test/Zuite_CommonTemplateForTradeZuite.xml +++ b/bt5/erp5_trade_ui_test/SkinTemplateItem/portal_skins/erp5_trade_ui_test/Zuite_CommonTemplateForTradeZuite.xml @@ -41,10 +41,9 @@ <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n xmlns:metal="http://xml.zope.org/namespaces/metal">\n - <tal:block metal:define-macro="init"\n - tal:define="global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n + <tal:block metal:define-macro="init">\n <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n - <tr tal:condition="is_selenium_0_8">\n + <tr>\n <td>setTimeout</td>\n <td>600000</td>\n <td></td>\n diff --git a/bt5/erp5_trade_ui_test/bt/revision b/bt5/erp5_trade_ui_test/bt/revision index 56a6051ca2b02b04ef92d5150c9ef600403cb1de..d8263ee9860594d2806b0dfd1bfd17528b0ba2a4 100644 --- a/bt5/erp5_trade_ui_test/bt/revision +++ b/bt5/erp5_trade_ui_test/bt/revision @@ -1 +1 @@ -1 \ No newline at end of file +2 \ No newline at end of file diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/planning_box_field_zuite/testPlanningBoxBlockPosition.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/planning_box_field_zuite/testPlanningBoxBlockPosition.xml index 5f08c38d92e02e54202a084d4307b311d8a00d65..671511ee4c75142f88fa3225d60f4c78a013c571 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/planning_box_field_zuite/testPlanningBoxBlockPosition.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/planning_box_field_zuite/testPlanningBoxBlockPosition.xml @@ -49,7 +49,7 @@ <table cellpadding="1" cellspacing="1" border="1">\n <thead>\n <tr><td rowspan="1" colspan="3">Test PlanningBox Block Positioning</td></tr>\n -</thead><tbody tal:define="is_selenium_0_8 python:here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n +</thead><tbody>\n <!-- Planning Box is not displayed in mobile skin\n So this test is skipped -->\n <tal:block tal:condition="python: context.TestTool_getSkinName()!=\'Mobile\'">\n @@ -164,68 +164,66 @@ <td>//div[@id="group_3_activity_1_block_1"]/div[@class="planning_box_center"]</td>\n <td>Title 2</td>\n </tr>\n -<tal:block tal:condition="is_selenium_0_8">\n - <tr>\n - <td>verifyElementPositionLeft</td>\n - <td>id=group_1_activity_1_block_1</td>\n - <td>552</td>\n - </tr>\n - <tr>\n - <td>verifyElementPositionLeft</td>\n - <td>id=group_2_activity_1_block_1</td>\n - <td>552</td>\n - </tr>\n - <tr>\n - <td>verifyElementPositionLeft</td>\n - <td>id=group_3_activity_1_block_1</td>\n - <td>552</td>\n - </tr>\n - <tr>\n - <td>verifyElementPositionTop</td>\n - <td>id=group_1_activity_1_block_1</td>\n - <td>250</td>\n - </tr>\n - <tr>\n - <td>verifyElementPositionTop</td>\n - <td>id=group_2_activity_1_block_1</td>\n - <td>330</td>\n - </tr>\n - <tr>\n - <td>verifyElementPositionTop</td>\n - <td>id=group_3_activity_1_block_1</td>\n - <td>410</td>\n - </tr>\n - <tr>\n - <td>verifyElementWidth</td>\n - <td>id=group_1_activity_1_block_1</td>\n - <td>320</td>\n - </tr>\n - <tr>\n - <td>verifyElementWidth</td>\n - <td>id=group_2_activity_1_block_1</td>\n - <td>320</td>\n - </tr>\n - <tr>\n - <td>verifyElementWidth</td>\n - <td>id=group_3_activity_1_block_1</td>\n - <td>320</td>\n - </tr>\n - <tr>\n - <td>assertElementHeight</td>\n - <td>id=group_1_activity_1_block_1</td>\n - <td>72</td>\n - </tr>\n - <tr>\n - <td>assertElementHeight</td>\n - <td>id=group_2_activity_1_block_1</td>\n - <td>72</td>\n - </tr>\n - <tr>\n - <td>assertElementHeight</td>\n - <td>id=group_3_activity_1_block_1</td>\n - <td>72</td>\n - </tr>\n -</tal:block>\n +<tr>\n + <td>verifyElementPositionLeft</td>\n + <td>id=group_1_activity_1_block_1</td>\n + <td>552</td>\n +</tr>\n +<tr>\n + <td>verifyElementPositionLeft</td>\n + <td>id=group_2_activity_1_block_1</td>\n + <td>552</td>\n +</tr>\n +<tr>\n + <td>verifyElementPositionLeft</td>\n + <td>id=group_3_activity_1_block_1</td>\n + <td>552</td>\n +</tr>\n +<tr>\n + <td>verifyElementPositionTop</td>\n + <td>id=group_1_activity_1_block_1</td>\n + <td>250</td>\n +</tr>\n +<tr>\n + <td>verifyElementPositionTop</td>\n + <td>id=group_2_activity_1_block_1</td>\n + <td>330</td>\n +</tr>\n +<tr>\n + <td>verifyElementPositionTop</td>\n + <td>id=group_3_activity_1_block_1</td>\n + <td>410</td>\n +</tr>\n +<tr>\n + <td>verifyElementWidth</td>\n + <td>id=group_1_activity_1_block_1</td>\n + <td>320</td>\n +</tr>\n +<tr>\n + <td>verifyElementWidth</td>\n + <td>id=group_2_activity_1_block_1</td>\n + <td>320</td>\n +</tr>\n +<tr>\n + <td>verifyElementWidth</td>\n + <td>id=group_3_activity_1_block_1</td>\n + <td>320</td>\n +</tr>\n +<tr>\n + <td>assertElementHeight</td>\n + <td>id=group_1_activity_1_block_1</td>\n + <td>72</td>\n +</tr>\n +<tr>\n + <td>assertElementHeight</td>\n + <td>id=group_2_activity_1_block_1</td>\n + <td>72</td>\n +</tr>\n +<tr>\n + <td>assertElementHeight</td>\n + <td>id=group_3_activity_1_block_1</td>\n + <td>72</td>\n +</tr>\n </tal:block>\n \n </tbody></table>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml index 439027daedca6589a63a808b94ecaab9fc352b68..b168c0d508ab522c3e12ece3ad5e1faa597ec11e 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml @@ -49,7 +49,7 @@ <table cellpadding="1" cellspacing="1" border="1">\n <thead>\n <tr><td rowspan="1" colspan="3">Test Multiple Relation Field Search Dialog Change Page</td></tr>\n -</thead><tbody tal:define="is_selenium_0_8 python:here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n +</thead><tbody>\n <tal:block metal:use-macro="here/RelationFieldZuite_CommonTemplate/macros/init" />\n <tr>\n <td>open</td>\n @@ -94,13 +94,7 @@ <tr>\n <td>type</td>\n <td>field_my_bar_category_title_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>%1%<br />%2%</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>%1%\n -%2%</td>\n -</tal:block>\n </tr>\n <tr>\n <td>clickAndWait</td>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml index f4718b1eb460540cfc740e30f800f6ec8e97518e..debc612cd507496e71575aff85e5f25b6475c28b 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml @@ -50,7 +50,7 @@ <thead>\n <tr><td rowspan="1" colspan="3">Test Relation Field Jump</td></tr>\n </thead>\n -<tbody tal:define="is_selenium_0_8 python:here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n +<tbody>\n <tal:block metal:use-macro="here/RelationFieldZuite_CommonTemplate/macros/init" />\n <tr>\n <td>open</td>\n @@ -122,13 +122,7 @@ will be shown\n <tr>\n <td>type</td>\n <td>field_my_category_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>bar_category/foo_module/0<br />bar_category/foo_module/1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>bar_category/foo_module/0\n -bar_category/foo_module/1</td>\n -</tal:block>\n <td></td>\n </tr>\n <tr>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml index 0a1c24be4b353b35bf6f5faaf478221fec6c1b09..0a7a48c4ab03e3cde03a1490cc0cf1f516308e07 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml @@ -50,7 +50,7 @@ <thead>\n <tr><td rowspan="1" colspan="3">Test Multi Relation Field, using metadata tab\n to set categories</td></tr>\n -</thead><tbody tal:define="is_selenium_0_8 python:here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n +</thead><tbody>\n <tal:block metal:use-macro="here/RelationFieldZuite_CommonTemplate/macros/init" />\n <tr>\n <td>open</td>\n @@ -85,13 +85,7 @@ to set categories</td></tr>\n <tr>\n <td>type</td>\n <td>field_my_category_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>bar_category/foo_module/0<br />bar_category/foo_module/1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>bar_category/foo_module/0\n -bar_category/foo_module/1</td>\n -</tal:block>\n <td></td>\n </tr>\n <tr>\n @@ -115,26 +109,13 @@ bar_category/foo_module/1</td>\n <tr>\n <td>verifyValue</td>\n <td>field_my_bar_category_title_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>Title 0<br />Title 1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>Title 0\n -Title 1</td>\n -</tal:block>\n <td></td>\n </tr>\n <tr>\n <td>type</td>\n <td>field_my_bar_category_title_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>Title 0<br />Title 1<br />Title 1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>Title 0\n -Title 1\n -Title 1</td>\n -</tal:block>\n <td>Make sure than we can repeat the second item in a list</td>\n </tr>\n <tr>\n @@ -146,28 +127,13 @@ Title 1</td>\n <tr>\n <td>verifyValue</td>\n <td>field_my_bar_category_title_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>Title 0<br />Title 1<br />Title 1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>Title 0\n -Title 1\n -Title 1</td>\n -</tal:block>\n <td></td>\n </tr>\n <tr>\n <td>type</td>\n <td>field_my_bar_category_title_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>Title 0<br />Title 0<br />Title 1<br />Title 1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>Title 0\n -Title 0\n -Title 1\n -Title 1</td>\n -</tal:block>\n <td>Make sure that we can repeat the first item (default) in a list</td>\n </tr>\n <tr>\n @@ -179,28 +145,13 @@ Title 1</td>\n <tr>\n <td>verifyValue</td>\n <td>field_my_bar_category_title_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>Title 0<br />Title 0<br />Title 1<br />Title 1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>Title 0\n -Title 0\n -Title 1\n -Title 1</td>\n -</tal:block>\n <td></td>\n </tr>\n <tr>\n <td>type</td>\n <td>field_my_bar_category_title_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>Title 1<br />Title 0<br />Title 1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>Title 1\n -Title 0\n -Title 1</td>\n -</tal:block>\n <td>Make sure we can reorder items in a list</td>\n </tr>\n <tr>\n @@ -212,14 +163,7 @@ Title 1</td>\n <tr>\n <td>verifyValue</td>\n <td>field_my_bar_category_title_list</td>\n -<tal:block tal:condition="is_selenium_0_8">\n <td>Title 1<br />Title 0<br />Title 1</td>\n -</tal:block>\n -<tal:block tal:condition="not:is_selenium_0_8">\n - <td>Title 1\n -Title 0\n -Title 1</td>\n -</tal:block>\n <td></td>\n </tr>\n <!-- XXX don\'t test jump for now, because we don\'t have good locators anyway.\n diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index 7f509bf3890f7334e9374d8cfb6e6d17e6a241ee..18133faa4c390be86679ce450d86d69567bfcf5c 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -560 \ No newline at end of file +564 \ No newline at end of file