From b44f76341eac3e44fbff63b856a920dd73b1db6f Mon Sep 17 00:00:00 2001
From: Yusei Tahara <yusei@nexedi.com>
Date: Fri, 11 Jan 2008 16:20:28 +0000
Subject: [PATCH] Updated test. Now we don't need to add mimetype_registry and
portal_transform manually. Fixed business template installation order.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18671 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5/tests/testCRM.py | 51 +++++++++++++----------------------
1 file changed, 19 insertions(+), 32 deletions(-)
diff --git a/product/ERP5/tests/testCRM.py b/product/ERP5/tests/testCRM.py
index c4c57b6e5d..a2c547413a 100644
--- a/product/ERP5/tests/testCRM.py
+++ b/product/ERP5/tests/testCRM.py
@@ -40,33 +40,27 @@ class TestCRMMailIngestion(ERP5TypeTestCase):
"""
def getBusinessTemplateList(self):
- return ('erp5_base', 'erp5_web', 'erp5_dms',
- 'erp5_dms_mysql_innodb_catalog', 'erp5_crm')
+ return ('erp5_base', 'erp5_crm', 'erp5_web',
+ 'erp5_dms_mysql_innodb_catalog', 'erp5_dms')
def afterSetUp(self):
portal = self.portal
- if 'portal_transforms' not in portal.objectIds():
- # XXX this should be done in bt5 (or ERP5Site, as install order is
- # important)
- # install needed tools
- dispatcher = portal.manage_addProduct
- dispatcher['MimetypesRegistry'].manage_addTool('MimeTypes Registry')
- dispatcher['PortalTransforms'].manage_addTool('Portal Transforms')
-
- # XXX this should not be necessary either
- # set prefered file name regular expression
- pref = portal.portal_preferences.default_site_preference
- pref.setPreferredDocumentFileNameRegularExpression('.*')
- pref.setPreferredDocumentReferenceRegularExpression('.*')
- pref.enable()
-
- # XXX do this in ERP5Site.py ?
- # sets up content type registry
- ctr = self.portal.content_type_registry
+
+ # XXX this should not be necessary either
+ # set prefered file name regular expression
+ pref = portal.portal_preferences.default_site_preference
+ pref.setPreferredDocumentFileNameRegularExpression('.*')
+ pref.setPreferredDocumentReferenceRegularExpression('.*')
+ pref.enable()
+
+ # XXX do this in ERP5Site.py ?
+ # sets up content type registry
+ ctr = self.portal.content_type_registry
+ if ctr.getPredicate('mail_message') is None:
ctr.addPredicate('mail_message', 'extension')
- ctr.getPredicate('mail_message').edit(extensions='eml')
- ctr.assignTypeName('mail_message', 'Mail Message')
- ctr.reorderPredicate('mail_message', 0)
+ ctr.getPredicate('mail_message').edit(extensions='eml')
+ ctr.assignTypeName('mail_message', 'Mail Message')
+ ctr.reorderPredicate('mail_message', 0)
# create customer organisation and person
if 'customer' not in portal.organisation_module.objectIds():
@@ -182,18 +176,11 @@ class TestCRMMailSend(ERP5TypeTestCase):
"""
def getBusinessTemplateList(self):
- return ('erp5_base', 'erp5_web', 'erp5_dms',
- 'erp5_dms_mysql_innodb_catalog', 'erp5_crm')
+ return ('erp5_base', 'erp5_crm', 'erp5_web',
+ 'erp5_dms_mysql_innodb_catalog', 'erp5_dms')
def afterSetUp(self):
portal = self.portal
- if 'portal_transforms' not in portal.objectIds():
- # XXX this should be done in bt5 (or ERP5Site, as install order is
- # important)
- # install needed tools
- dispatcher = portal.manage_addProduct
- dispatcher['MimetypesRegistry'].manage_addTool('MimeTypes Registry')
- dispatcher['PortalTransforms'].manage_addTool('Portal Transforms')
# create customer organisation and person
if 'customer' not in portal.organisation_module.objectIds():
--
2.30.9