summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlse-odoo <lse@odoo.com>2025-01-30 15:04:08 +0000
committerlse-odoo <lse@odoo.com>2025-02-06 10:43:58 +0000
commitfa2b3e4700a426ebf4fa11021c0ce92e18c620e2 (patch)
treebeebaec650b666197c77f8cde589e7095c96a4c8
parenta6a5381b8fdffc736962ea2ca860f63aaf142d3d (diff)
[FIX] ressource: move @mail dependency in ressource_mail module
Before this commit: 1. Install `ressource` module 2. In debug, open "Run unit tests" debug menu 3. Error pop-up: ```js Global Error: stack trace available in the console Missing dependencies: @mail/../tests/mail_test_helpers ``` After this commit: No error and units tests can proceed runbot-task-72187 closes odoo/odoo#196623 X-original-commit: 5dacf5eaad83ce5b62d83bba2769e16796713f14 Signed-off-by: Sébastien Theys (seb) <seb@odoo.com> Signed-off-by: Loan Sens (lse) <lse@odoo.com>
-rw-r--r--addons/resource/static/tests/resource_test_helpers.js3
-rw-r--r--addons/resource_mail/static/tests/many2many_avatar_resource.test.js4
-rw-r--r--addons/resource_mail/static/tests/many2one_avatar_resource.test.js4
-rw-r--r--addons/resource_mail/static/tests/resource_mail_test_helpers.js7
4 files changed, 12 insertions, 6 deletions
diff --git a/addons/resource/static/tests/resource_test_helpers.js b/addons/resource/static/tests/resource_test_helpers.js
index c6c17365d57..e49b5abd474 100644
--- a/addons/resource/static/tests/resource_test_helpers.js
+++ b/addons/resource/static/tests/resource_test_helpers.js
@@ -1,6 +1,5 @@
import { ResourceTask } from "./mock_server/mock_models/resource_task";
import { ResourceResource } from "./mock_server/mock_models/resource_resource";
-import { mailModels } from "@mail/../tests/mail_test_helpers";
import { defineModels } from "@web/../tests/web_test_helpers";
export const resourceModels = {
@@ -9,5 +8,5 @@ export const resourceModels = {
};
export function defineResourceModels() {
- return defineModels({ ...mailModels, ...resourceModels });
+ return defineModels(resourceModels);
}
diff --git a/addons/resource_mail/static/tests/many2many_avatar_resource.test.js b/addons/resource_mail/static/tests/many2many_avatar_resource.test.js
index a84421ce7ee..16144e40a50 100644
--- a/addons/resource_mail/static/tests/many2many_avatar_resource.test.js
+++ b/addons/resource_mail/static/tests/many2many_avatar_resource.test.js
@@ -8,11 +8,11 @@ import {
} from "@mail/../tests/mail_test_helpers";
import { beforeEach, describe, expect, test } from "@odoo/hoot";
import { queryAll } from "@odoo/hoot-dom";
-import { defineResourceModels } from "@resource/../tests/resource_test_helpers";
+import { defineResourceMailModels } from "./resource_mail_test_helpers";
describe.current.tags("desktop");
const data = {};
-defineResourceModels();
+defineResourceMailModels();
beforeEach(async () => {
/* 1. Create data
3 type of resources will be tested in the widget:
diff --git a/addons/resource_mail/static/tests/many2one_avatar_resource.test.js b/addons/resource_mail/static/tests/many2one_avatar_resource.test.js
index ea57a700966..dd8e790cc51 100644
--- a/addons/resource_mail/static/tests/many2one_avatar_resource.test.js
+++ b/addons/resource_mail/static/tests/many2one_avatar_resource.test.js
@@ -1,4 +1,4 @@
-import { defineResourceModels } from "@resource/../tests/resource_test_helpers";
+import { defineResourceMailModels } from "./resource_mail_test_helpers";
import { beforeEach, describe, expect, test } from "@odoo/hoot";
import { queryFirst } from "@odoo/hoot-dom";
import {
@@ -12,7 +12,7 @@ import {
describe.current.tags("desktop");
const data = {};
-defineResourceModels();
+defineResourceMailModels();
beforeEach(async () => {
/* 1. Create data
3 type of records tested:
diff --git a/addons/resource_mail/static/tests/resource_mail_test_helpers.js b/addons/resource_mail/static/tests/resource_mail_test_helpers.js
new file mode 100644
index 00000000000..4c372aeced6
--- /dev/null
+++ b/addons/resource_mail/static/tests/resource_mail_test_helpers.js
@@ -0,0 +1,7 @@
+import { mailModels } from "@mail/../tests/mail_test_helpers";
+import { resourceModels } from "@resource/../tests/resource_test_helpers";
+import { defineModels } from "@web/../tests/web_test_helpers";
+
+export function defineResourceMailModels() {
+ return defineModels({ ...mailModels, ...resourceModels });
+}