Skip to content

erp5
erp5
Commit 854e0e19 authored by Leonardo Rochael Almeida's avatar Leonardo Rochael Almeida
Browse files
Options

drop useless Zelenium version check 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34858 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c25640c7
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 193 deletions
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_accounting_ui_test/SkinTemplateItem/portal_skins/erp5_accounting_ui_test/AccountingZuite_CommonTemplate.xml
View file @ 854e0e19
......@@ -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() &gt; \'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
......
bt5/erp5_accounting_ui_test/bt/revision
View file @ 854e0e19
155
\ No newline at end of file
156
\ No newline at end of file
bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_internal_supply_line_price_quantity_step.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
View file @ 854e0e19
......@@ -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() &gt; \'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
......
bt5/erp5_pdm_ui_test/bt/revision
View file @ 854e0e19
21
\ No newline at end of file
23
\ No newline at end of file
bt5/erp5_project_ui_test/SkinTemplateItem/portal_skins/erp5_project_ui_test/Zuite_CommonTemplateForProjectZuite.xml
View file @ 854e0e19
......@@ -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() &gt; \'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
......
bt5/erp5_project_ui_test/bt/revision
View file @ 854e0e19
3
\ No newline at end of file
4
\ No newline at end of file
bt5/erp5_trade_ui_test/SkinTemplateItem/portal_skins/erp5_trade_ui_test/Zuite_CommonTemplateForTradeZuite.xml
View file @ 854e0e19
......@@ -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() &gt; \'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
......
bt5/erp5_trade_ui_test/bt/revision
View file @ 854e0e19
1
\ No newline at end of file
2
\ No newline at end of file
bt5/erp5_ui_test/PathTemplateItem/portal_tests/planning_box_field_zuite/testPlanningBoxBlockPosition.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testMultiRelationFieldSearchDialogChangePage.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldJump.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml
View file @ 854e0e19
......@@ -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
......
bt5/erp5_ui_test/bt/revision
View file @ 854e0e19
560
\ No newline at end of file
564
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7