diff --git a/product/ERP5/tests/testInvoiceVAT.py b/product/ERP5/tests/testInvoiceVAT.py index 96e64180fecacb40d4d9acac10f6a42080009ae9..7288f27a77c78b14a7fe3f14b1f6e7998dc1222b 100644 --- a/product/ERP5/tests/testInvoiceVAT.py +++ b/product/ERP5/tests/testInvoiceVAT.py @@ -56,6 +56,7 @@ class TestInvoiceVAT(ERP5TypeTestCase): """set up """ self.createCategories() self.login() + self.validateRules() def _safeTic(self): """Like tic, but swallowing errors, usefull for teardown""" diff --git a/product/ERP5/tests/testOrder.py b/product/ERP5/tests/testOrder.py index 338e8be5ae6f7ea5264ce7cf350676005330fc19..98bd8cc4d096994ee3f32ccf46b9fcba9f0ebd0e 100644 --- a/product/ERP5/tests/testOrder.py +++ b/product/ERP5/tests/testOrder.py @@ -108,16 +108,6 @@ class TestOrderMixin: portal_type='Category', id=category_id) - def validateRules(self, sequence=None, sequence_list=[]): - """ - does what it says it does - """ - rule_tool = self.getRuleTool() - for rule in rule_tool.contentValues( - portal_type=rule_tool.getPortalRuleTypeList()): - if rule.getValidationState() != 'validated': - rule.validate() - def stepTic(self,**kw): self.tic() diff --git a/product/ERP5Type/tests/ERP5TypeTestCase.py b/product/ERP5Type/tests/ERP5TypeTestCase.py index 70e960f9785c1e26c3dc3868355f0c788f3b8ffa..9418959330b49c7c8fc3312044a11f69783f7c50 100644 --- a/product/ERP5Type/tests/ERP5TypeTestCase.py +++ b/product/ERP5Type/tests/ERP5TypeTestCase.py @@ -474,6 +474,15 @@ class ERP5TypeTestCase(PortalTestCase): return getattr(self.getPortal(), 'currency_module', getattr(self.getPortal(), 'currency', None)) + def validateRules(self): + """ + try to validate all rules in rule_tool + """ + rule_tool = self.getRuleTool() + for rule in rule_tool.contentValues( + portal_type=rule_tool.getPortalRuleTypeList()): + rule.validate() + def tic(self): """ Start all messages