Commit 87289ded authored by Arnaud Fontaine's avatar Arnaud Fontaine

WIP

parent 52077620
...@@ -929,8 +929,8 @@ class TestBase(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -929,8 +929,8 @@ class TestBase(ERP5TypeTestCase, ZopeTestCase.Functional):
# Add a non-existent workflow. # Add a non-existent workflow.
pw = self.getWorkflowTool() pw = self.getWorkflowTool()
dummy_worlflow_id = 'never_existent_workflow' dummy_workflow_id = 'never_existent_workflow'
addWorkflowByType(pw, 'erp5_workflow', dummy_worlflow_id) addWorkflowByType(pw, 'erp5_workflow', dummy_workflow_id)
self.commit() self.commit()
...@@ -938,7 +938,7 @@ class TestBase(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -938,7 +938,7 @@ class TestBase(ERP5TypeTestCase, ZopeTestCase.Functional):
organisation_initial_workflow_list = organisation_type.getTypeWorkflowList() organisation_initial_workflow_list = organisation_type.getTypeWorkflowList()
organisation_type.setTypeWorkflowList( organisation_type.setTypeWorkflowList(
organisation_initial_workflow_list + [dummy_workflow_id]) organisation_initial_workflow_list + [dummy_workflow_id])
pw.manage_delObjects([dummy_worlflow_id]) pw.manage_delObjects([dummy_workflow_id])
self.commit() self.commit()
......
...@@ -53,7 +53,7 @@ portal.support_request_module.newContent( ...@@ -53,7 +53,7 @@ portal.support_request_module.newContent(
).validate() ).validate()
# create a campaign that should not appear in this worklist # create a campaign that should not appear in this worklist
if portal.portal_workflow.ticket_workflow.worklists.get('0A_draft_campaign_list', None) is None: if portal.portal_workflow.ticket_workflow.getWorklistValueById('0A_draft_campaign_list') is None:
raise ValueError('Without this worklist, tests have to be updated.') raise ValueError('Without this worklist, tests have to be updated.')
portal.campaign_module.newContent( portal.campaign_module.newContent(
portal_type='Campaign', portal_type='Campaign',
......
...@@ -536,7 +536,7 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase): ...@@ -536,7 +536,7 @@ class TestOrderBuilder(TestOrderBuilderMixin, ERP5TypeTestCase):
""" """
# changing type_list here is somehow dirty, decision would need to be taken if this is acceptable # changing type_list here is somehow dirty, decision would need to be taken if this is acceptable
# for everyone to have auto_planned as part of future inventory # for everyone to have auto_planned as part of future inventory
self.portal.portal_workflow.order_workflow.states['auto_planned'].type_list = ('planned_order', 'future_inventory') self.portal.portal_workflow.order_workflow.getStateValueById('auto_planned').setStateTypeList(('planned_order', 'future_inventory'))
self.portal.portal_caches.clearAllCache() self.portal.portal_caches.clearAllCache()
self.assertTrue('auto_planned' in self.portal.getPortalFutureInventoryStateList()) self.assertTrue('auto_planned' in self.portal.getPortalFutureInventoryStateList())
# end of patch # end of patch
......
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