pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: fix chatter attachment drop test

Browse Source 
The chatter drop attachment test fails in an indeterministic manner.
This is because we're assuming that the next render will be the one
corresponding to the file uploading. In order to be sure this render
is really the one we're expecting, the `o-file-uploader-upload` event
is added.

closes odoo/odoo#99652

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
This commit is contained in:
tsm-odoo
2022-09-07 18:56:57 +02:00
parent a17c6d0250
commit 0954f0284c
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/models/file_uploader.js
+1
View File
@@ -46,6 +46,7 @@ registerModel({
if (this.chatterOwner && !this.chatterOwner.attachmentBoxView) {
this.chatterOwner.openAttachmentBoxView();
}
this.messaging.messagingBus.trigger('o-file-uploader-upload', { files });
},
/**
* Create an HTML element that will serve as file input.
addons/mail/static/tests/qunit_suite_tests/components/chatter_tests.js
+21 -17
View File
@@ -231,13 +231,13 @@ QUnit.test('chatter: drop attachments', async function (assert) {
const pyEnv = await startServer();
const resPartnerId1 = pyEnv['res.partner'].create({});
const { openView } = await start();
const { afterEvent, openView } = await start();
await openView({
res_id: resPartnerId1,
res_model: 'res.partner',
views: [[false, 'form']],
});
const files = [
let files = [
await createFile({
content: 'hello, world',
contentType: 'text/plain',
@@ -260,9 +260,12 @@ QUnit.test('chatter: drop attachments', async function (assert) {
"should have no attachment before files are dropped"
);
await afterNextRender(() =>
dropFiles(document.querySelector('.o_Chatter_dropZone'), files)
);
await afterNextRender(() => afterEvent({
eventName: 'o-file-uploader-upload',
func: () => dropFiles(document.querySelector('.o_Chatter_dropZone'), files),
message: "should wait until files are uploaded",
predicate: ({ files: uploadedFiles }) => uploadedFiles === files,
}));
assert.strictEqual(
document.querySelectorAll(`.o_AttachmentBox .o_AttachmentCard`).length,
2,
@@ -270,18 +273,19 @@ QUnit.test('chatter: drop attachments', async function (assert) {
);
await afterNextRender(() => dragenterFiles(document.querySelector('.o_Chatter')));
await afterNextRender(async () =>
dropFiles(
document.querySelector('.o_Chatter_dropZone'),
[
await createFile({
content: 'hello, world',
contentType: 'text/plain',
name: 'text3.txt',
})
]
)
);
files = [
await createFile({
content: 'hello, world',
contentType: 'text/plain',
name: 'text3.txt',
})
];
await afterNextRender(() => afterEvent({
eventName: 'o-file-uploader-upload',
func: () => dropFiles(document.querySelector('.o_Chatter_dropZone'), files),
message: "should wait until files are uploaded",
predicate: ({ files: uploadedFiles }) => uploadedFiles === files,
}));
assert.strictEqual(
document.querySelectorAll(`.o_AttachmentBox .o_AttachmentCard`).length,
3,