Commit dee54adf authored by Vincent Pelletier's avatar Vincent Pelletier

Make worklist definition more realistic. It fixes a bug in SQL-cached version...

Make worklist definition more realistic. It fixes a bug in SQL-cached version of worklist test, because the same objects caused 2 lines to be present in worklist cache, which are summed afterward - hence causing a 2-objects worklist to be displayed when there is actualy just one object.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18332 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 9ccd5aa3
...@@ -43,6 +43,7 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -43,6 +43,7 @@ class TestWorklist(ERP5TypeTestCase):
login = PortalTestCase.login login = PortalTestCase.login
checked_portal_type = 'Organisation' checked_portal_type = 'Organisation'
checked_validation_state = 'draft'
checked_workflow = 'validation_workflow' checked_workflow = 'validation_workflow'
worklist_assignor_id = 'assignor_worklist' worklist_assignor_id = 'assignor_worklist'
actbox_assignor_name = 'assignor_todo' actbox_assignor_name = 'assignor_todo'
...@@ -128,7 +129,9 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -128,7 +129,9 @@ class TestWorklist(ERP5TypeTestCase):
def createDocument(self): def createDocument(self):
module = self.getPortal().getDefaultModule(self.checked_portal_type) module = self.getPortal().getDefaultModule(self.checked_portal_type)
return module.newContent(portal_type=self.checked_portal_type) result = module.newContent(portal_type=self.checked_portal_type)
assert result.getValidationState() == self.checked_validation_state
return result
def getWorklistDocumentCountFromActionName(self, action_name): def getWorklistDocumentCountFromActionName(self, action_name):
self.assertEquals(action_name[-1], ')') self.assertEquals(action_name[-1], ')')
...@@ -149,7 +152,8 @@ class TestWorklist(ERP5TypeTestCase): ...@@ -149,7 +152,8 @@ class TestWorklist(ERP5TypeTestCase):
worklist_definition.setProperties('', worklist_definition.setProperties('',
actbox_name='%s (%%(count)s)' % (actbox_name, ), actbox_name='%s (%%(count)s)' % (actbox_name, ),
props={'guard_roles': role, props={'guard_roles': role,
'var_match_portal_type': self.checked_portal_type}) 'var_match_portal_type': self.checked_portal_type,
'var_match_validation_state': self.checked_validation_state})
def clearCache(self): def clearCache(self):
self.portal.portal_caches.clearAllCache() self.portal.portal_caches.clearAllCache()
......
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