Commit ccfab754 authored by Rafael Monnerat's avatar Rafael Monnerat 👻

Standard Configurator BT5 list changed

The final outcome is the same because the dependencies are handled
automatically.

Improve verbose comparing only set() instead the list size.
parent 0ff806e8
...@@ -41,7 +41,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -41,7 +41,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
""" """
# The list of standard business templates that the configurator should force # The list of standard business templates that the configurator should force
# to install # to install
standard_bt5_list = ('erp5_simulation', expected_bt5_list = ('erp5_simulation',
'erp5_dhtml_style', 'erp5_dhtml_style',
'erp5_jquery', 'erp5_jquery',
'erp5_jquery_ui', 'erp5_jquery_ui',
...@@ -65,6 +65,21 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -65,6 +65,21 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
'erp5_odt_style', 'erp5_odt_style',
'erp5_ooo_import') 'erp5_ooo_import')
standard_bt5_list = ('erp5_dhtml_style',
'erp5_jquery_ui',
'erp5_xhtml_jquery_style',
'erp5_ingestion_mysql_innodb_catalog',
'erp5_dms',
'erp5_crm',
'erp5_simplified_invoicing',
'erp5_trade_knowledge_pad',
'erp5_crm_knowledge_pad',
'erp5_tax_resource',
'erp5_discount_resource',
'erp5_ods_style',
'erp5_odt_style',
'erp5_ooo_import')
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy', return ('erp5_core_proxy_field_legacy',
'erp5_full_text_myisam_catalog', 'erp5_full_text_myisam_catalog',
...@@ -155,9 +170,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -155,9 +170,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
business_configuration = sequence.get("business_configuration") business_configuration = sequence.get("business_configuration")
# second one: install some standard business templates # second one: install some standard business templates
standard_bt5_config_save = business_configuration['1'] standard_bt5_config_save = business_configuration['1']
self.assertEquals(len(self.standard_bt5_list),
len(standard_bt5_config_save.contentValues(
portal_type='Standard BT5 Configurator Item')))
self.assertEquals( self.assertEquals(
set(self.standard_bt5_list), set(self.standard_bt5_list),
set([x.bt5_id for x in standard_bt5_config_save.contentValues()])) set([x.bt5_id for x in standard_bt5_config_save.contentValues()]))
...@@ -528,7 +540,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -528,7 +540,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
# check if bt5 are installed. # check if bt5 are installed.
bt5_title_list = self.portal.portal_templates.getInstalledBusinessTemplateTitleList() bt5_title_list = self.portal.portal_templates.getInstalledBusinessTemplateTitleList()
expected_list = self.standard_bt5_list + bt5_tuple expected_list = self.expected_bt5_list + bt5_tuple
self.assertEquals([i for i in expected_list if i not in bt5_title_list], []) self.assertEquals([i for i in expected_list if i not in bt5_title_list], [])
self.assertFalse(bc_id in bt5_title_list) self.assertFalse(bc_id in bt5_title_list)
......
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