From dc2ade763a9479da2dfcc5493ab4fe43b2b0a8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 11 Oct 2018 10:30:57 +0000 Subject: [PATCH] [REF] hr, hr_holidays: use odoo test helper method to create test users Purpose of this commit is to use the newly introduced helper to create test users in a quick way and reduce code duplication. This commit is linked to task ID 1889703 and PR #27526. --- addons/hr/tests/common.py | 16 ++--------- addons/hr_holidays/tests/common.py | 43 +++++++----------------------- 2 files changed, 12 insertions(+), 47 deletions(-) diff --git a/addons/hr/tests/common.py b/addons/hr/tests/common.py index f84b7d85fc3..74aae9fccd0 100644 --- a/addons/hr/tests/common.py +++ b/addons/hr/tests/common.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from odoo.addons.test_mail.tests.common import mail_new_test_user from odoo.tests import common @@ -9,17 +10,4 @@ class TestHrCommon(common.TransactionCase): def setUp(self): super(TestHrCommon, self).setUp() - self._quick_create_ctx = { - 'mail_create_nolog': True, - 'mail_create_nosubscribe': True, - 'mail_notrack': True, - } - self._quick_create_user_ctx = dict(self._quick_create_ctx, no_reset_password=True) - - self.res_users_hr_officer = self.env['res.users'].with_context(self._quick_create_user_ctx).create({ - 'name': 'HR Officer', - 'login': 'hro', - 'email': 'hro@example.com', - 'company_id': self.ref('base.main_company'), - 'groups_id': [(6, 0, [self.ref('base.group_user'), self.ref('hr.group_hr_user')])] - }) + self.res_users_hr_officer = mail_new_test_user(self.env, login='hro', groups='base.group_user,hr.group_hr_user', name='HR Officer', email='hro@example.com') diff --git a/addons/hr_holidays/tests/common.py b/addons/hr_holidays/tests/common.py index 43c5df67181..0f9c6f1cc89 100644 --- a/addons/hr_holidays/tests/common.py +++ b/addons/hr_holidays/tests/common.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. +from odoo.addons.test_mail.tests.common import mail_new_test_user from odoo.tests import common @@ -9,42 +10,18 @@ class TestHrHolidaysBase(common.TransactionCase): def setUp(self): super(TestHrHolidaysBase, self).setUp() - self._quick_create_ctx = { - 'mail_create_nolog': True, - 'mail_create_nosubscribe': True, - 'mail_notrack': True, - } - self._quick_create_user_ctx = dict(self._quick_create_ctx, no_reset_password=True) - # Test users to use through the various tests - Users = self.env['res.users'].with_context(self._quick_create_user_ctx) - self.user_hruser = Users.create({ - 'name': 'Armande HrUser', - 'login': 'Armande', - 'email': 'armande.hruser@example.com', - 'groups_id': [(6, 0, [self.ref('base.group_user'), self.ref('hr_holidays.group_hr_holidays_user')])] - }) + self.user_hruser = mail_new_test_user(self.env, login='armande', groups='base.group_user,hr_holidays.group_hr_holidays_user') self.user_hruser_id = self.user_hruser.id - self.user_hrmanager = Users.create({ - 'name': 'Bastien HrManager', - 'login': 'bastien', - 'email': 'bastien.hrmanager@example.com', - 'groups_id': [(6, 0, [self.ref('base.group_user'), self.ref('hr_holidays.group_hr_holidays_manager')])] - }).id - self.user_hrmanager_id = self.user_hrmanager - self.user_employee = Users.create({ - 'name': 'David Employee', - 'login': 'david', - 'email': 'david.employee@example.com', - 'groups_id': [(6, 0, [self.ref('base.group_user')])] - }) + + self.user_hrmanager = mail_new_test_user(self.env, login='bastien', groups='base.group_user,hr_holidays.group_hr_holidays_manager') + self.user_hrmanager_id = self.user_hrmanager.id + + self.user_employee = mail_new_test_user(self.env, login='david', groups='base.group_user') self.user_employee_id = self.user_employee.id - self.user_hrmanager_2_id = Users.create({ - 'name': 'Florence HrManager', - 'login': 'florence', - 'email': 'florence.hrmanager@example.com', - 'groups_id': [(6, 0, [self.ref('base.group_user'), self.ref('hr_holidays.group_hr_holidays_manager')])] - }).id + + self.user_hrmanager_2 = mail_new_test_user(self.env, login='florence', groups='base.group_user,hr_holidays.group_hr_holidays_manager') + self.user_hrmanager_2_id = self.user_hrmanager_2.id # Hr Data Department = self.env['hr.department'].with_context(tracking_disable=True)