From 1d3c57d09d9efdd177391efe8d1b0ad5478ce928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= Date: Wed, 15 Feb 2017 06:31:52 +0000 Subject: [PATCH 1/2] base: validate logins consistency in validate_action --- .../login_validation_workflow/transitions/validate.xml | 2 +- .../login_validation_workflow/transitions/validate_action.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/login_validation_workflow/transitions/validate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/login_validation_workflow/transitions/validate.xml index 44898ad5dff..de4a5108683 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/login_validation_workflow/transitions/validate.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/login_validation_workflow/transitions/validate.xml @@ -46,7 +46,7 @@ script_name - checkConsistency + title diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/login_validation_workflow/transitions/validate_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/login_validation_workflow/transitions/validate_action.xml index 74991256536..e5c515feddb 100644 --- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/login_validation_workflow/transitions/validate_action.xml +++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/login_validation_workflow/transitions/validate_action.xml @@ -42,7 +42,7 @@ script_name - + checkConsistency title -- 2.30.9 From c8e0b8ad104ed1d284b80eee629c3b3b541b0c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= Date: Wed, 15 Feb 2017 10:20:20 +0000 Subject: [PATCH 2/2] test: update tests related to login consistency checks Login consistency is only checked when we call validate_action. --- product/ERP5Security/tests/testERP5Security.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/product/ERP5Security/tests/testERP5Security.py b/product/ERP5Security/tests/testERP5Security.py index bd990167fe6..c00159f97bc 100644 --- a/product/ERP5Security/tests/testERP5Security.py +++ b/product/ERP5Security/tests/testERP5Security.py @@ -119,11 +119,13 @@ class TestUserManagement(ERP5TypeTestCase): if login is not None: if login is AUTO_LOGIN: login = 'login_%s' % self._login_generator() - new_person.newContent( + login_document = new_person.newContent( portal_type='ERP5 Login', reference=login, password=password, - ).validate() + ) + # we execute user action transition to make sure validation checks are performed. + self.portal.portal_workflow.doActionFor(login_document, 'validate_action') if tic: self.tic() return new_person.Person_getUserId(), login, password @@ -243,7 +245,6 @@ class TestUserManagement(ERP5TypeTestCase): login_value.invalidate() login_value.setReference('') self.commit() - self.assertRaises(ValidationFailed, login_value.validate) self.assertRaises(ValidationFailed, self.portal.portal_workflow.doActionFor, login_value, 'validate_action') def test_PersonWithLoginWithNotAssignmentAreNotUsers(self): @@ -570,7 +571,6 @@ class TestUserManagement(ERP5TypeTestCase): login2_value.invalidate() login2_value.setReference(login1) self.commit() - self.assertRaises(ValidationFailed, login2_value.validate) self.assertRaises(ValidationFailed, self.portal.portal_workflow.doActionFor, login2_value, 'validate_action') def _duplicateLoginReference(self, commit): -- 2.30.9