[Erp5-report] r25490 - in /erp5/trunk/bt5/erp5_pdm_ui_test: PathTemplateItem/portal_tests/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Sat Feb 7 17:33:00 CET 2009
Author: kazuhiko
Date: Sat Feb 7 17:32:59 2009
New Revision: 25490
URL: http://svn.erp5.org?rev=25490&view=rev
Log:
* validate rules (same as r.25365, but still required for running pdm_ui_test only without accounting_ui_test).
* modify for Selenium >= 0.8 compatibility.
Modified:
erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml
erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml
erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_reset.xml
erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision
Modified: erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml?rev=25490&r1=25489&r2=25490&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_purchase_supply_line_price_quantity_step.xml [utf8] Sat Feb 7 17:32:59 2009
@@ -9,12 +9,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_bind_names</string> </key>
<value>
@@ -68,8 +62,13 @@
<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
@@ -142,19 +141,18 @@
<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
<td>Base_edit:method</td>\n
<td></td>\n
-</tr>\n
-<tr>\n
- <td>assertText</td>\n
- <td>field_my_purchase_supply_line_quantity_step_list</td>\n
- <td>foo\n
-bar</td>\n
</tr>\n
<tr>\n
<td>assertText</td>\n
Modified: erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml?rev=25490&r1=25489&r2=25490&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm_ui_test/PathTemplateItem/portal_tests/pdm_zuite/resource_default_sale_supply_line_price_quantity_step.xml [utf8] Sat Feb 7 17:32:59 2009
@@ -9,12 +9,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_bind_names</string> </key>
<value>
@@ -68,8 +62,13 @@
<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
@@ -142,8 +141,13 @@
<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
Modified: erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml?rev=25490&r1=25489&r2=25490&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_CommonTemplate.xml [utf8] Sat Feb 7 17:32:59 2009
@@ -9,12 +9,6 @@
</pickle>
<pickle>
<dictionary>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
<item>
<key> <string>_bind_names</string> </key>
<value>
@@ -42,22 +36,23 @@
</value>
</item>
<item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
<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" tal:define="base_url python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\', here.getPortalObject().getId())">\n
+ <tal:block metal:define-macro="init"\n
+ tal:define="base_url python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\', here.getPortalObject().getId());\n
+ global is_selenium_0_8 python: here.getPortalObject().portal_tests.getZeleniumVersion() > \'Zelenium-0.8\'">\n
<tr>\n
<td>store</td>\n
<td tal:content="base_url">erp5</td>\n
<td>base_url</td>\n
+ </tr>\n
+ <tr tal:condition="is_selenium_0_8">\n
+ <td>setTimeout</td>\n
+ <td>600000</td>\n
+ <td></td>\n
</tr>\n
<tr>\n
<td>open</td>\n
Modified: erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_reset.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_reset.xml?rev=25490&r1=25489&r2=25490&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_reset.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_reset.xml [utf8] Sat Feb 7 17:32:59 2009
@@ -3,30 +3,15 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PythonScripts.PythonScript</string>
- <string>PythonScript</string>
- </tuple>
- <none/>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
- <key> <string>Python_magic</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
@@ -85,6 +70,11 @@
destination_site_id = "erp5_pdm_ui_test_destination_site"\n
destination_site_title = "erp5_pdm_ui_test_destination_site_title"\n
\n
+# validate rules\n
+for rule in portal.portal_rules.objectValues():\n
+ if rule.getReference() != \'default_payment_rule\':\n
+ rule.validate()\n
+\n
# Create resource\n
module = portal.getDefaultModule(resource_portal_type)\n
resource = module.newContent(\n
@@ -124,12 +114,6 @@
</item>
<item>
<key> <string>_code</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
- <key> <string>_filepath</string> </key>
<value>
<none/>
</value>
@@ -179,10 +163,11 @@
<string>source_site_title</string>
<string>destination_site_id</string>
<string>destination_site_title</string>
+ <string>_getiter_</string>
+ <string>rule</string>
<string>module</string>
<string>resource</string>
<string>base_category</string>
- <string>_getiter_</string>
<string>site_id</string>
<string>site_title</string>
<string>site</string>
Modified: erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision?rev=25490&r1=25489&r2=25490&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_pdm_ui_test/bt/revision [utf8] Sat Feb 7 17:32:59 2009
@@ -1,1 +1,1 @@
-12
+13
More information about the Erp5-report
mailing list