[MOV] mail, *: move utils files up

* = calendar, hr, hr_holidays, im_livechat, note, sms, snailmail,
test_mail, website_livechat, website_slides
Task-2759586

closes odoo/odoo#86791

Related: odoo/enterprise#25491
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>

addons/calendar/static/tests/systray_activity_menu_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 import ActivityMenu from '@mail/js/systray/systray_activity_menu';
 
 import testUtils from 'web.test_utils';

addons/hr/static/tests/m2x_avatar_employee_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import KanbanView from 'web.KanbanView';

addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js

@@ -4,7 +4,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('hr_holidays', {}, function () {
 QUnit.module('components', {}, function () {

addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js

@@ -4,7 +4,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_view_tests.js

@@ -4,7 +4,7 @@ import { insertAndReplace, link } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('hr_holidays', {}, function () {
 QUnit.module('components', {}, function () {

addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {

addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {

addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js

@@ -3,7 +3,7 @@
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {

addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {

addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js

@@ -5,7 +5,7 @@ import {
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { datetime_to_str } from 'web.time';
 

addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {

addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js

@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {

addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js

@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/__manifest__.py

@@ -84,9 +84,7 @@
             'mail/static/src/models/*.js',
             'mail/static/src/public/*',
             'mail/static/src/services/messaging/messaging.js',
-            'mail/static/src/utils/*/*.js',
-            'mail/static/src/utils/messaging_component.js',
-            'mail/static/src/utils/utils.js',
+            'mail/static/src/utils/*.js',
             # Framework JS
             'bus/static/src/js/*.js',
             'bus/static/src/js/services/bus_service.js',
@@ -116,9 +114,7 @@
             # defines mixins and variables used by multiple components
             'mail/static/src/components/notification_list/notification_list_item.scss',
             'mail/static/src/js/**/*.js',
-            'mail/static/src/utils/*/*.js',
-            'mail/static/src/utils/messaging_component.js',
-            'mail/static/src/utils/utils.js',
+            'mail/static/src/utils/*.js',
             'mail/static/src/scss/*.scss',
             'mail/static/src/component_hooks/*.js',
             'mail/static/src/components/*/*.js',
@@ -141,7 +137,6 @@
         ],
         'web.tests_assets': [
             'mail/static/src/env/test_env.js',
-            'mail/static/src/utils/test_utils.js',
             'mail/static/tests/helpers/*.js',
             'mail/static/tests/models/*.js',
         ],

addons/mail/static/src/model/model_manager.js

@@ -6,7 +6,7 @@ import { FieldCommand, unlinkAll } from '@mail/model/model_field_command';
 import { RelationSet } from '@mail/model/model_field_relation_set';
 import { Listener } from '@mail/model/model_listener';
 import { followRelations } from '@mail/model/model_utils';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 
 /**
  * Object that manage models and records, notably their update cycle: whenever

addons/mail/static/src/models/messaging.js

@@ -4,7 +4,7 @@ import { registerModel } from '@mail/model/model_core';
 import { attr, many, one } from '@mail/model/model_field';
 import { OnChange } from '@mail/model/model_onchange';
 import { insertAndReplace, link, unlink } from '@mail/model/model_field_command';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 
 const { EventBus } = owl;
 

addons/mail/static/src/models/rtc.js

@@ -5,8 +5,7 @@ import { browser } from "@web/core/browser/browser";
 import { registerModel } from '@mail/model/model_core';
 import { attr, many, one } from '@mail/model/model_field';
 import { clear, insert, unlink } from '@mail/model/model_field_command';
-
-import { monitorAudio } from '@mail/utils/media_monitoring/media_monitoring';
+import { monitorAudio } from '@mail/utils/media_monitoring';
 
 /**
  * The order in which transceivers are added, relevant for RTCPeerConnection.getTransceivers which returns

addons/mail/static/src/models/thread.js

@@ -4,8 +4,8 @@ import { registerModel } from '@mail/model/model_core';
 import { attr, many, one } from '@mail/model/model_field';
 import { clear, insert, insertAndReplace, link, replace, unlink, unlinkAll } from '@mail/model/model_field_command';
 import { OnChange } from '@mail/model/model_onchange';
-import throttle from '@mail/utils/throttle/throttle';
-import Timer from '@mail/utils/timer/timer';
+import throttle from '@mail/utils/throttle';
+import Timer from '@mail/utils/timer';
 import { cleanSearchTerm } from '@mail/utils/utils';
 import * as mailUtils from '@mail/js/utils';
 

addons/mail/static/src/utils/throttle.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 
 /**
  * This module define an utility function that enables throttling calls on a

addons/mail/static/src/utils/timer.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 
 //------------------------------------------------------------------------------
 // Errors

addons/mail/static/tests/helpers/mock_server.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { nextAnimationFrame } from '@mail/utils/test_utils';
+import { nextAnimationFrame } from '@mail/../tests/helpers/test_utils';
 
 import MockServer from 'web.MockServer';
 import { datetime_to_str } from 'web.time';

addons/mail/static/tests/helpers/model_definitions_setup.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { TEST_USER_IDS } from '@mail/utils/test_utils';
+import { TEST_USER_IDS } from '@mail/../tests/helpers/test_utils';
 import {
     addFakeModel,
     addModelNamesToFetch,

addons/mail/static/tests/helpers/test_utils.js

@@ -10,7 +10,7 @@ import {
 import { insertAndReplace, replace } from '@mail/model/model_field_command';
 import { ChatWindowService } from '@mail/services/chat_window_service/chat_window_service';
 import { MessagingService } from '@mail/services/messaging/messaging';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import { DialogService } from '@mail/services/dialog_service/dialog_service';
 import { getMessagingComponent } from '@mail/utils/messaging_component';
 import { nextTick } from '@mail/utils/utils';

addons/mail/static/tests/qunit_mobile_suite_tests/components/discuss_mobile_mailbox_selection_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/chatter_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import ListView from 'web.ListView';

addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 import { date_to_str } from 'web.time';

addons/mail/static/tests/qunit_suite_tests/components/attachment_box_tests.js

@@ -6,7 +6,7 @@ import {
     dragenterFiles,
     dropFiles,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { file } from 'web.test_utils';
 

addons/mail/static/tests/qunit_suite_tests/components/attachment_image_tests.js

@@ -4,7 +4,7 @@ import { link } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/attachment_list_tests.js

@@ -6,7 +6,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/channel_invitation_form_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js

@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { file, dom } from 'web.test_utils';
 const { createFile, inputFiles } = file;
@@ -226,7 +226,7 @@ QUnit.test('chat window new message: fold', async function (assert) {
 QUnit.test('open chat from "new message" chat window should open chat in place of this "new message" chat window', async function (assert) {
     /**
      * InnerWith computation uses following info:
-     * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
+     * ([mocked] global window width: @see `mail/static/tests/helpers/test_utils.js:start()` method)
      * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
@@ -860,7 +860,7 @@ QUnit.test('chat window: close on ESCAPE', async function (assert) {
 QUnit.test('focus next visible chat window when closing current chat window with ESCAPE [REQUIRE FOCUS]', async function (assert) {
     /**
      * computation uses following info:
-     * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
+     * ([mocked] global window width: @see `mail/static/tests/helpers/test_utils.js:start()` method)
      * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
@@ -1054,7 +1054,7 @@ QUnit.test('chat window: scroll conservation on toggle discuss', async function
 QUnit.test('open 2 different chat windows: enough screen width [REQUIRE FOCUS]', async function (assert) {
     /**
      * computation uses following info:
-     * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
+     * ([mocked] global window width: @see `mail/static/tests/helpers/test_utils.js:start()` method)
      * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
@@ -1657,7 +1657,7 @@ QUnit.test('chat window: switch on TAB', async function (assert) {
 QUnit.test('chat window: TAB cycle with 3 open chat windows [REQUIRE FOCUS]', async function (assert) {
     /**
      * InnerWith computation uses following info:
-     * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
+     * ([mocked] global window width: @see `mail/static/tests/helpers/test_utils.js:start()` method)
      * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px

addons/mail/static/tests/qunit_suite_tests/components/chatter_suggested_recipient_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/chatter_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, nextAnimationFrame, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, nextAnimationFrame, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/chatter_topbar_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, nextAnimationFrame, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, nextAnimationFrame, start } from '@mail/../tests/helpers/test_utils';
 
 import { makeTestPromise } from 'web.test_utils';
 

addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_canned_response_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_channel_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_command_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/composer_tests.js

@@ -9,7 +9,7 @@ import {
     nextAnimationFrame,
     pasteFiles,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import {

addons/mail/static/tests/qunit_suite_tests/components/dialog_manager_tests.js

@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/discuss_inbox_tests.js

@@ -5,7 +5,7 @@ import {
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/mail/static/tests/qunit_suite_tests/components/discuss_message_edit_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/discuss_pinned_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { datetime_to_str } from 'web.time';
 

addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_tests.js

@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/discuss_tests.js

@@ -7,7 +7,7 @@ import {
     nextAnimationFrame,
     start,
     startServer,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 import { makeTestPromise, file } from 'web.test_utils';

addons/mail/static/tests/qunit_suite_tests/components/follow_button_tests.js

@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/follower_list_menu_tests.js

@@ -6,7 +6,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js

@@ -6,7 +6,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js

@@ -1,13 +1,13 @@
 /** @odoo-module **/
 
 import { insert, link } from '@mail/model/model_field_command';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js

@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/message_tests.js

@@ -1,14 +1,14 @@
 /** @odoo-module **/
 
 import { insert, insertAndReplace, link, replace } from '@mail/model/model_field_command';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     createRootMessagingComponent,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/mail/static/tests/qunit_suite_tests/components/messaging_menu_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { makeTestPromise } from 'web.test_utils';
 

addons/mail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start, } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start, } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/mail/static/tests/qunit_suite_tests/components/notification_list_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js

@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js

@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/thread_needaction_preview_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/mail/static/tests/qunit_suite_tests/components/thread_preview_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js

@@ -6,7 +6,7 @@ import {
     createRootMessagingComponent,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/components/thread_view_tests.js

@@ -6,7 +6,7 @@ import {
     beforeEach,
     dragenterFiles,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {

addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js

@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { Many2OneAvatarUser } from '@mail/js/m2x_avatar_user';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 import { click, getFixture, legacyExtraNextTick, patchWithCleanup, triggerHotkey } from "@web/../tests/helpers/utils";
 import { doAction } from '@web/../tests/webclient/helpers';
 import { registry } from "@web/core/registry";

addons/mail/static/tests/qunit_suite_tests/model_field_commands/clear_tests.js

@@ -4,7 +4,7 @@ import { clear, insertAndReplace } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {

addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_and_replace_tests.js

@@ -4,7 +4,7 @@ import { insertAndReplace } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {

addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_tests.js

@@ -4,7 +4,7 @@ import { insert, insertAndReplace } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {

addons/mail/static/tests/qunit_suite_tests/model_field_commands/link_tests.js

@@ -4,7 +4,7 @@ import { insertAndReplace, link } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {

addons/mail/static/tests/qunit_suite_tests/model_field_commands/replace_tests.js

@@ -4,7 +4,7 @@ import { insertAndReplace, replace } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {

addons/mail/static/tests/qunit_suite_tests/model_field_commands/set_tests.js

@@ -8,7 +8,7 @@ import {
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {

addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_all_tests.js

@@ -4,7 +4,7 @@ import { insertAndReplace, unlinkAll } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {

addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_tests.js

@@ -4,7 +4,7 @@ import { insertAndReplace, unlink } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {

addons/mail/static/tests/qunit_suite_tests/models/attachment_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {

addons/mail/static/tests/qunit_suite_tests/models/clock_tests.js

@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { insertAndReplace } from '@mail/model/model_field_command';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {

addons/mail/static/tests/qunit_suite_tests/models/file_uploader_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import { file } from 'web.test_utils';
 

addons/mail/static/tests/qunit_suite_tests/models/message_tests.js

@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { insert, insertAndReplace, link } from '@mail/model/model_field_command';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import { str_to_datetime } from 'web.time';
 

addons/mail/static/tests/qunit_suite_tests/models/messaging_menu_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {

addons/mail/static/tests/qunit_suite_tests/models/messaging_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {

addons/mail/static/tests/qunit_suite_tests/models/thread_tests.js

@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { insert } from '@mail/model/model_field_command';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {

addons/mail/static/tests/qunit_suite_tests/systray_activity_menu_tests.js

@@ -5,7 +5,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import testUtils from 'web.test_utils';
 

addons/mail/static/tests/qunit_suite_tests/utils/throttle_tests.js

@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
-import throttle from '@mail/utils/throttle/throttle';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
+import throttle from '@mail/utils/throttle';
 import { nextTick } from '@mail/utils/utils';
 
 const { ThrottleReinvokedError, ThrottleCanceledError } = throttle;

addons/mail/static/tests/qunit_suite_tests/utils/timer_tests.js

@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
-import { beforeEach, nextTick, start } from '@mail/utils/test_utils';
-import Timer from '@mail/utils/timer/timer';
+import { beforeEach, nextTick, start } from '@mail/../tests/helpers/test_utils';
+import Timer from '@mail/utils/timer';
 
 const { TimerClearedError } = Timer;
 

addons/mail/static/tests/qunit_suite_tests/webclient/commands/mail_providers_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 import { editSearchBar } from '@web/../tests/core/commands/command_service_tests';
 import { click, getFixture, nextTick, patchWithCleanup, triggerHotkey } from "@web/../tests/helpers/utils";
 import { browser } from '@web/core/browser/browser';

addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js

@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import config from 'web.config';
 import fieldRegistry from 'web.field_registry';

addons/mail/static/tests/qunit_suite_tests/widgets/notification_alert_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 

addons/mail_bot/static/tests/messaging_initializer_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail_bot', {}, function () {
 QUnit.module('messaging_initializer_tests.js', {

addons/note/static/tests/systray_activity_menu_tests.js

@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import ActivityMenu from '@mail/js/systray/systray_activity_menu';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import testUtils from 'web.test_utils';
 

addons/sms/static/tests/qunit_suite_tests/components/message_tests.js

@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
 import { insert, insertAndReplace } from '@mail/model/model_field_command';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/sms/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js

@@ -5,7 +5,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/snailmail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 

addons/test_mail/static/tests/tracking_value_tests.js

@@ -3,7 +3,7 @@
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import testUtils from 'web.test_utils';

addons/website_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js

@@ -3,7 +3,7 @@
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('website_livechat', {}, function () {
 QUnit.module('components', {}, function () {

addons/website_livechat/static/tests/qunit_suite_tests/messaging_notification_handler_tests.js

@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import { mock } from 'web.test_utils';

addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js

@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('website_slides', {}, function () {
 QUnit.module('components', {}, function () {