[fix] tests

This commit is contained in:
Rushabh Mehta 2016-03-26 08:34:36 +05:30
parent 7fef687090
commit f0d28480c8
3 changed files with 2 additions and 11 deletions

View file

@ -64,9 +64,7 @@ class TestUser(unittest.TestCase):
frappe.set_user("testperm@example.com")
me = frappe.get_doc("User", "testperm@example.com")
me.add_roles("System Manager")
self.assertTrue("System Manager" not in [d.role for d in me.get("user_roles")])
self.assertRaises(frappe.PermissionError, me.add_roles, "System Manager")
frappe.set_user("Administrator")

View file

@ -39,7 +39,6 @@ class User(Document):
if self.name not in STANDARD_USERS:
self.validate_email_type(self.email)
self.add_system_manager_role()
self.validate_system_manager_user_type()
self.set_system_user()
self.check_enable_disable()
self.update_gravatar()
@ -75,12 +74,6 @@ class User(Document):
"role": "System Manager"
})
def validate_system_manager_user_type(self):
#if user has system manager role then user type should be system user
if ("System Manager" in [user_role.role for user_role in
self.get("user_roles")]) and self.get("user_type") != "System User":
frappe.throw(_("User with System Manager Role should always have User Type: System User"))
def email_new_password(self, new_password=None):
if new_password and not self.in_insert:
_update_password(self.name, new_password)

View file

@ -830,7 +830,7 @@ class Document(BaseDocument):
if user not in _seen:
_seen.append(user)
self.db_set('_seen', json.dumps(_seen))
self.db_set('_seen', json.dumps(_seen), update_modified=False)
frappe.local.flags.commit = True
def get_signature(self):