From 6b50bdb44eef3135e64116a3b5f3aea464a2bfeb Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Mon, 25 Oct 2010 19:27:44 +0000
Subject: [PATCH] TestCommerce: fix validation of order rule
git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@39507 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5/tests/testERP5Commerce.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/product/ERP5/tests/testERP5Commerce.py b/product/ERP5/tests/testERP5Commerce.py
index 35c860259c..7995eedecf 100644
--- a/product/ERP5/tests/testERP5Commerce.py
+++ b/product/ERP5/tests/testERP5Commerce.py
@@ -109,6 +109,10 @@ class TestCommerce(ERP5TypeTestCase):
'erp5_commerce',
'erp5_simulation_test')
+ def getRule(self, **kw):
+ return self.portal.portal_rules.searchFolder(
+ sort_on='version', sort_order='descending', **kw)[0].getObject()
+
def afterSetUp(self):
uf = self.getPortal().acl_users
uf._doAddUser('ivan', '', ['Manager'], [])
@@ -160,9 +164,9 @@ class TestCommerce(ERP5TypeTestCase):
shipping.publish()
# validate default order rule
- default_order_rule = self.portal.portal_rules.default_order_rule
- if default_order_rule.getValidationState() != 'validated':
- self.portal.portal_rules.default_order_rule.validate()
+ rule = self.getRule(reference='default_order_rule')
+ if rule.getValidationState() != 'validated':
+ rule.validate()
self.website = self.setupWebSite()
self.website.setProperty('ecommerce_base_currency',
--
2.30.9