From df147ac6f2cf3e1a48a3bd19647949be56c08f64 Mon Sep 17 00:00:00 2001 From: "Louis Wicket (wil)" Date: Tue, 15 Mar 2022 13:33:21 +0000 Subject: [PATCH] [IMP] mail, *: move model tests into/static/tests * : mail_bot, website_livechat Task-2759560 Part-of: odoo/odoo#86464 --- .../{src/models/attachment => }/tests/attachment_tests.js | 4 ---- .../composer_view => }/tests/composer_view_qunit_tests.js | 0 .../static/{src/models/message => }/tests/message_tests.js | 4 ---- .../message_view => }/tests/message_view_qunit_tests.js | 0 .../models/messaging_menu => }/tests/messaging_menu_tests.js | 4 ---- .../{src/models/messaging => }/tests/messaging_tests.js | 4 ---- .../tests/notification_list_view_qunit_tests.js | 0 .../mail/static/{src/models/thread => }/tests/thread_tests.js | 4 ---- .../thread_view => }/tests/thread_viewer_qunit_tests.js | 0 .../tests/messaging_initializer_tests.js | 4 ---- .../tests/messaging_notification_handler_tests.js | 4 ---- 11 files changed, 28 deletions(-) rename addons/mail/static/{src/models/attachment => }/tests/attachment_tests.js (97%) rename addons/mail/static/{src/models/composer_view => }/tests/composer_view_qunit_tests.js (100%) rename addons/mail/static/{src/models/message => }/tests/message_tests.js (98%) rename addons/mail/static/{src/models/message_view => }/tests/message_view_qunit_tests.js (100%) rename addons/mail/static/{src/models/messaging_menu => }/tests/messaging_menu_tests.js (90%) rename addons/mail/static/{src/models/messaging => }/tests/messaging_tests.js (97%) rename addons/mail/static/{src/models/notification_list_view => }/tests/notification_list_view_qunit_tests.js (100%) rename addons/mail/static/{src/models/thread => }/tests/thread_tests.js (98%) rename addons/mail/static/{src/models/thread_view => }/tests/thread_viewer_qunit_tests.js (100%) rename addons/mail_bot/static/{src/models/messaging_initializer => }/tests/messaging_initializer_tests.js (91%) rename addons/website_livechat/static/{src/models/messaging_notification_handler => }/tests/messaging_notification_handler_tests.js (95%) diff --git a/addons/mail/static/src/models/attachment/tests/attachment_tests.js b/addons/mail/static/tests/attachment_tests.js similarity index 97% rename from addons/mail/static/src/models/attachment/tests/attachment_tests.js rename to addons/mail/static/tests/attachment_tests.js index 2cfb54ebf0e..cc049d2e65a 100644 --- a/addons/mail/static/src/models/attachment/tests/attachment_tests.js +++ b/addons/mail/static/tests/attachment_tests.js @@ -3,8 +3,6 @@ import { beforeEach, start } from '@mail/utils/test_utils'; QUnit.module('mail', {}, function () { -QUnit.module('models', {}, function () { -QUnit.module('attachment', {}, function () { QUnit.module('attachment_tests.js', { async beforeEach() { await beforeEach(this); @@ -134,5 +132,3 @@ QUnit.test('isViewable', async function (assert) { }); }); -}); -}); diff --git a/addons/mail/static/src/models/composer_view/tests/composer_view_qunit_tests.js b/addons/mail/static/tests/composer_view_qunit_tests.js similarity index 100% rename from addons/mail/static/src/models/composer_view/tests/composer_view_qunit_tests.js rename to addons/mail/static/tests/composer_view_qunit_tests.js diff --git a/addons/mail/static/src/models/message/tests/message_tests.js b/addons/mail/static/tests/message_tests.js similarity index 98% rename from addons/mail/static/src/models/message/tests/message_tests.js rename to addons/mail/static/tests/message_tests.js index 94553af17d7..b46a14458ef 100644 --- a/addons/mail/static/src/models/message/tests/message_tests.js +++ b/addons/mail/static/tests/message_tests.js @@ -6,8 +6,6 @@ import { beforeEach, start } from '@mail/utils/test_utils'; import { str_to_datetime } from 'web.time'; QUnit.module('mail', {}, function () { -QUnit.module('models', {}, function () { -QUnit.module('message', {}, function () { QUnit.module('message_tests.js', { async beforeEach() { await beforeEach(this); @@ -178,5 +176,3 @@ QUnit.test('message with body "test" should not be considered empty', async func }); }); -}); -}); diff --git a/addons/mail/static/src/models/message_view/tests/message_view_qunit_tests.js b/addons/mail/static/tests/message_view_qunit_tests.js similarity index 100% rename from addons/mail/static/src/models/message_view/tests/message_view_qunit_tests.js rename to addons/mail/static/tests/message_view_qunit_tests.js diff --git a/addons/mail/static/src/models/messaging_menu/tests/messaging_menu_tests.js b/addons/mail/static/tests/messaging_menu_tests.js similarity index 90% rename from addons/mail/static/src/models/messaging_menu/tests/messaging_menu_tests.js rename to addons/mail/static/tests/messaging_menu_tests.js index 9a0a856bfec..ea860bf9201 100644 --- a/addons/mail/static/src/models/messaging_menu/tests/messaging_menu_tests.js +++ b/addons/mail/static/tests/messaging_menu_tests.js @@ -3,8 +3,6 @@ import { beforeEach, start } from '@mail/utils/test_utils'; QUnit.module('mail', {}, function () { -QUnit.module('models', {}, function () { -QUnit.module('messaging_menu', {}, function () { QUnit.module('messaging_menu_tests.js', { async beforeEach() { await beforeEach(this); @@ -34,5 +32,3 @@ QUnit.test('messaging menu counter should ignore unread messages in channels tha }); }); -}); -}); diff --git a/addons/mail/static/src/models/messaging/tests/messaging_tests.js b/addons/mail/static/tests/messaging_tests.js similarity index 97% rename from addons/mail/static/src/models/messaging/tests/messaging_tests.js rename to addons/mail/static/tests/messaging_tests.js index db02ce21b70..2dadbf9e22d 100644 --- a/addons/mail/static/src/models/messaging/tests/messaging_tests.js +++ b/addons/mail/static/tests/messaging_tests.js @@ -3,8 +3,6 @@ import { beforeEach, start } from '@mail/utils/test_utils'; QUnit.module('mail', {}, function () { -QUnit.module('models', {}, function () { -QUnit.module('messaging', {}, function () { QUnit.module('messaging_tests.js', { async beforeEach() { await beforeEach(this); @@ -128,5 +126,3 @@ QUnit.test('openChat: open existing chat for user', async function (assert) { }); }); -}); -}); diff --git a/addons/mail/static/src/models/notification_list_view/tests/notification_list_view_qunit_tests.js b/addons/mail/static/tests/notification_list_view_qunit_tests.js similarity index 100% rename from addons/mail/static/src/models/notification_list_view/tests/notification_list_view_qunit_tests.js rename to addons/mail/static/tests/notification_list_view_qunit_tests.js diff --git a/addons/mail/static/src/models/thread/tests/thread_tests.js b/addons/mail/static/tests/thread_tests.js similarity index 98% rename from addons/mail/static/src/models/thread/tests/thread_tests.js rename to addons/mail/static/tests/thread_tests.js index 273691e57b6..b4f1e30a629 100644 --- a/addons/mail/static/src/models/thread/tests/thread_tests.js +++ b/addons/mail/static/tests/thread_tests.js @@ -4,8 +4,6 @@ import { insert } from '@mail/model/model_field_command'; import { beforeEach, start } from '@mail/utils/test_utils'; QUnit.module('mail', {}, function () { -QUnit.module('models', {}, function () { -QUnit.module('thread', {}, function () { QUnit.module('thread_tests.js', { async beforeEach() { await beforeEach(this); @@ -141,5 +139,3 @@ QUnit.test('create (chat)', async function (assert) { }); }); -}); -}); diff --git a/addons/mail/static/src/models/thread_view/tests/thread_viewer_qunit_tests.js b/addons/mail/static/tests/thread_viewer_qunit_tests.js similarity index 100% rename from addons/mail/static/src/models/thread_view/tests/thread_viewer_qunit_tests.js rename to addons/mail/static/tests/thread_viewer_qunit_tests.js diff --git a/addons/mail_bot/static/src/models/messaging_initializer/tests/messaging_initializer_tests.js b/addons/mail_bot/static/tests/messaging_initializer_tests.js similarity index 91% rename from addons/mail_bot/static/src/models/messaging_initializer/tests/messaging_initializer_tests.js rename to addons/mail_bot/static/tests/messaging_initializer_tests.js index 28a25d74d69..76bbe754bf2 100644 --- a/addons/mail_bot/static/src/models/messaging_initializer/tests/messaging_initializer_tests.js +++ b/addons/mail_bot/static/tests/messaging_initializer_tests.js @@ -3,8 +3,6 @@ import { beforeEach, start } from '@mail/utils/test_utils'; QUnit.module('mail_bot', {}, function () { -QUnit.module('models', {}, function () { -QUnit.module('messaging_initializer', {}, function () { QUnit.module('messaging_initializer_tests.js', { beforeEach() { beforeEach(this); @@ -46,5 +44,3 @@ QUnit.test('OdooBot initialized at init', async function (assert) { }); }); -}); -}); diff --git a/addons/website_livechat/static/src/models/messaging_notification_handler/tests/messaging_notification_handler_tests.js b/addons/website_livechat/static/tests/messaging_notification_handler_tests.js similarity index 95% rename from addons/website_livechat/static/src/models/messaging_notification_handler/tests/messaging_notification_handler_tests.js rename to addons/website_livechat/static/tests/messaging_notification_handler_tests.js index 68d4de3f746..b07a1542b3d 100644 --- a/addons/website_livechat/static/src/models/messaging_notification_handler/tests/messaging_notification_handler_tests.js +++ b/addons/website_livechat/static/tests/messaging_notification_handler_tests.js @@ -10,8 +10,6 @@ import FormView from 'web.FormView'; import { mock } from 'web.test_utils'; QUnit.module('website_livechat', {}, function () { -QUnit.module('models', {}, function () { -QUnit.module('messaging_notification_handler', {}, function () { QUnit.module('messaging_notification_handler_tests.js', { async beforeEach() { await beforeEach(this); @@ -83,5 +81,3 @@ QUnit.test('should open chat window on send chat request to website visitor', as }); }); -}); -});