From 188afc6954a193fc0f4f54f7c744966dc7e3ebc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Theys?= Date: Fri, 10 Jun 2022 10:45:20 +0000 Subject: [PATCH] [IMP] mail: really open and close discuss in chat window manager test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Part of task-2871070 closes odoo/odoo#93273 Signed-off-by: Alexandre Kühn (aku) --- .../components/chat_window_manager_tests.js | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js index 34ea0fa9083..bec3c270814 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js @@ -862,8 +862,8 @@ QUnit.test('chat window: composer state conservation on toggle discuss', async f assert.expect(6); const pyEnv = await startServer(); - pyEnv['mail.channel'].create(); - const { click, createMessagingMenuComponent, insertText, messaging } = await start(); + const mailChannelId = pyEnv['mail.channel'].create(); + const { click, createMessagingMenuComponent, insertText, openDiscuss, openView } = await start(); const messagingMenuComponent = await createMessagingMenuComponent(); await click(`.o_MessagingMenu_toggler`); await click(`.o_MessagingMenu_dropdownMenu .o_NotificationList_preview`); @@ -905,10 +905,14 @@ QUnit.test('chat window: composer state conservation on toggle discuss', async f "composer should have 2 total attachments after adding 2 attachments" ); - await afterNextRender(() => messaging.discuss.open()); + await openDiscuss(); assert.containsNone(document.body, '.o_ChatWindow', "should not have any chat window after opening discuss"); - await afterNextRender(() => messaging.discuss.close()); + await openView({ + res_id: mailChannelId, + res_model: 'mail.channel', + views: [[false, 'form']], + }); assert.strictEqual( document.querySelector(`.o_ComposerTextInput_textarea`).value, "XDU for the win !", @@ -934,7 +938,7 @@ QUnit.test('chat window: scroll conservation on toggle discuss', async function res_id: mailChannelId1, }); } - const { afterEvent, click, createMessagingMenuComponent, messaging } = await start(); + const { afterEvent, click, createMessagingMenuComponent, openDiscuss, openView } = await start(); await createMessagingMenuComponent(); await click(`.o_MessagingMenu_toggler`); await afterEvent({ @@ -968,12 +972,16 @@ QUnit.test('chat window: scroll conservation on toggle discuss', async function }, }); - await afterNextRender(() => messaging.discuss.open()); + await openDiscuss(); assert.containsNone(document.body, '.o_ChatWindow', "should not have any chat window after opening discuss"); await afterEvent({ eventName: 'o-component-message-list-scrolled', - func: () => messaging.discuss.close(), + func: () => openView({ + res_id: mailChannelId1, + res_model: 'mail.channel', + views: [[false, 'form']], + }), message: "should wait until channel 20 restored its scroll to 142 after closing discuss", predicate: ({ scrollTop, thread }) => { return ( @@ -1820,7 +1828,7 @@ QUnit.test('chat window with a thread: keep scroll position in message list on t res_id: mailChannelId1, }); } - const { afterEvent, click, createMessagingMenuComponent, messaging } = await start(); + const { afterEvent, click, createMessagingMenuComponent, openDiscuss, openView } = await start(); await createMessagingMenuComponent(); await click(`.o_MessagingMenu_toggler`); await afterEvent({ @@ -1853,10 +1861,14 @@ QUnit.test('chat window with a thread: keep scroll position in message list on t }); // fold chat window await click('.o_ChatWindow_header'); - await afterNextRender(() => messaging.discuss.open()); + await openDiscuss(); assert.containsNone(document.body, '.o_ChatWindow', "should not have any chat window after opening discuss"); - await afterNextRender(() => messaging.discuss.close()); + await openView({ + res_id: mailChannelId1, + res_model: 'mail.channel', + views: [[false, 'form']], + }); // unfold chat window await afterEvent({ eventName: 'o-component-message-list-scrolled',