From a1f7ca7895f157cbe06f0e22e9f3114629b7b712 Mon Sep 17 00:00:00 2001 From: tsm-odoo Date: Thu, 31 Mar 2022 11:13:31 +0000 Subject: [PATCH] [IMP] hr: register m2x avatar employee fake model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In preparation of test adaptation after introducing a new way to seed test data, the fake model present on the m2x avatar employee test has been registered to the model definitions instead of being declared on it's test. task-2792108 closes odoo/odoo#87665 Signed-off-by: Sébastien Theys (seb) --- .../tests/helpers/model_definitions_setup.js | 7 +++- .../static/tests/m2x_avatar_employee_tests.js | 40 ++++++++----------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/addons/hr/static/tests/helpers/model_definitions_setup.js b/addons/hr/static/tests/helpers/model_definitions_setup.js index 190d7e5013d..52913b961b5 100644 --- a/addons/hr/static/tests/helpers/model_definitions_setup.js +++ b/addons/hr/static/tests/helpers/model_definitions_setup.js @@ -1,5 +1,10 @@ /** @odoo-module **/ -import { addModelNamesToFetch } from '@mail/../tests/helpers/model_definitions_helpers'; +import { addFakeModel, addModelNamesToFetch } from '@mail/../tests/helpers/model_definitions_helpers'; addModelNamesToFetch(['hr.employee.public']); + +addFakeModel('m2x.avatar.employee', { + employee_id: { string: "Employee", type: 'many2one', relation: 'hr.employee.public' }, + employee_ids: { string: "Employees", type: "many2many", relation: 'hr.employee.public' }, +}); diff --git a/addons/hr/static/tests/m2x_avatar_employee_tests.js b/addons/hr/static/tests/m2x_avatar_employee_tests.js index 1b0d3bcd6ab..1545df09564 100644 --- a/addons/hr/static/tests/m2x_avatar_employee_tests.js +++ b/addons/hr/static/tests/m2x_avatar_employee_tests.js @@ -20,20 +20,12 @@ QUnit.module('hr', {}, function () { // reset the cache before each test Many2OneAvatarEmployee.prototype.partnerIds = {}; - Object.assign(this.data, { - 'foo': { - fields: { - employee_id: { string: "Employee", type: 'many2one', relation: 'hr.employee.public' }, - employee_ids: { string: "Employees", type: "many2many", relation: 'hr.employee.public' }, - }, - records: [ - { id: 1, employee_id: 11, employee_ids: [11, 23] }, - { id: 2, employee_id: 7 }, - { id: 3, employee_id: 11 }, - { id: 4, employee_id: 23 }, - ], - }, - }); + this.data['m2x.avatar.employee'].records.push( + { id: 1, employee_id: 11, employee_ids: [11, 23] }, + { id: 2, employee_id: 7 }, + { id: 3, employee_id: 11 }, + { id: 4, employee_id: 23 }, + ); this.data['hr.employee.public'].records.push( { id: 11, name: "Mario", user_id: 11, user_partner_id: 11 }, { id: 7, name: "Luigi", user_id: 12, user_partner_id: 12 }, @@ -59,7 +51,7 @@ QUnit.module('hr', {}, function () { hasChatWindow: true, hasView: true, View: ListView, - model: 'foo', + model: 'm2x.avatar.employee', data: this.data, arch: '', mockRPC(route, args) { @@ -135,7 +127,7 @@ QUnit.module('hr', {}, function () { const { widget: kanban } = await start({ hasView: true, View: KanbanView, - model: 'foo', + model: 'm2x.avatar.employee', data: this.data, arch: ` @@ -167,7 +159,7 @@ QUnit.module('hr', {}, function () { const { widget: form } = await start({ hasView: true, View: FormView, - model: 'foo', + model: 'm2x.avatar.employee', data: this.data, arch: '
', mockRPC(route, args) { @@ -205,7 +197,7 @@ QUnit.module('hr', {}, function () { await dom.click(form.$('.o_m2o_avatar > img')); assert.verifySteps([ - 'read foo 1', + 'read m2x.avatar.employee 1', 'read hr.employee.public 11', ]); @@ -219,7 +211,7 @@ QUnit.module('hr', {}, function () { hasChatWindow: true, hasView: true, View: FormView, - model: 'foo', + model: 'm2x.avatar.employee', data: this.data, arch: '
', mockRPC(route, args) { @@ -241,7 +233,7 @@ QUnit.module('hr', {}, function () { await dom.click(form.$('.o_field_many2manytags.avatar .badge:nth(1) .o_m2m_avatar')); assert.verifySteps([ - "read foo 1", + "read m2x.avatar.employee 1", 'read hr.employee.public 11,23', "read hr.employee.public 11", "read hr.employee.public 23", @@ -264,7 +256,7 @@ QUnit.module('hr', {}, function () { hasChatWindow: true, hasView: true, View: ListView, - model: 'foo', + model: 'm2x.avatar.employee', data: this.data, arch: '', mockRPC(route, args) { @@ -326,7 +318,7 @@ QUnit.module('hr', {}, function () { const { widget: kanban } = await start({ hasView: true, View: KanbanView, - model: 'foo', + model: 'm2x.avatar.employee', data: this.data, arch: ` @@ -382,7 +374,7 @@ QUnit.module('hr', {}, function () { hasChatWindow: true, hasView: true, View: FormView, - model: 'foo', + model: 'm2x.avatar.employee', data: this.data, arch: '
', mockRPC(route, args) { @@ -425,7 +417,7 @@ QUnit.module('hr', {}, function () { await dom.click(form.$('.o_field_many2manytags.avatar .badge:nth(1) .o_m2m_avatar')); assert.verifySteps([ - 'read foo 1', + 'read m2x.avatar.employee 1', 'read hr.employee.public 11,23', "read hr.employee.public 11", "read hr.employee.public 23"