[REF] mail: adapt code after jQuery update

Part of task 1896658

Co-authored-by: Aaron Bohy <aab@odoo.com>
Co-authored-by: Christophe Matthieu <chm@odoo.com>
Co-authored-by: Mathieu Duckerts-Antoine <dam@odoo.com>
Co-authored-by: David Monjoie <dmo@odoo.com>
Co-authored-by: Martin Geubelle <mge@odoo.com>
Co-authored-by: svs-odoo <svs@odoo.com>
Co-authored-by: Vincent Schippefilt <vsc@odoo.com>

1 files changed, 23 insertions, 22 deletions

diff --git a/addons/mail/static/tests/document_viewer_tests.js b/addons/mail/static/tests/document_viewer_tests.js
index 87fa2dbed94..5d3dcf7069f 100644
--- a/addons/mail/static/tests/document_viewer_tests.js
+++ b/addons/mail/static/tests/document_viewer_tests.js
@@ -20,16 +20,16 @@ var createViewer = function (params) {
 
     var mockRPC = function (route) {
         if (route === '/web/static/lib/pdfjs/web/viewer.html?file=/web/content/1?model%3Dir.attachment') {
-            return $.when();
+            return Promise.resolve();
         }
         if (route === 'https://www.youtube.com/embed/FYqW0Gdwbzk') {
-            return $.when();
+            return Promise.resolve();
         }
         if (route === '/web/content/4?model%3Dir.attachment') {
-            return $.when();
+            return Promise.resolve();
         }
         if (route === '/web/image/6?unique=1&signature=999&model=ir.attachment') {
-            return $.when();
+            return Promise.resolve();
         }
     };
     testUtils.mock.addMockEnvironment(parent, {
@@ -51,14 +51,15 @@ var createViewer = function (params) {
         $target = $('body');
         $target.addClass('debug');
     }
-    viewer.appendTo($target);
 
     // actually destroy the parent when the viewer is destroyed
     viewer.destroy = function () {
         delete viewer.destroy;
         parent.destroy();
     };
-    return viewer;
+    return viewer.appendTo($target).then(function() {
+        return viewer;
+    });
 };
 
 QUnit.module('DocumentViewer', {
@@ -74,10 +75,10 @@ QUnit.module('DocumentViewer', {
     },
 }, function () {
 
-    QUnit.test('basic rendering', function (assert) {
+    QUnit.test('basic rendering', async function (assert) {
         assert.expect(7);
 
-        var viewer = createViewer({
+        var viewer = await createViewer({
             attachmentID: 1,
             attachments: this.attachments,
         });
@@ -100,11 +101,11 @@ QUnit.module('DocumentViewer', {
         viewer.destroy();
     });
 
-    QUnit.test('Document Viewer Youtube', function (assert) {
+    QUnit.test('Document Viewer Youtube', async function (assert) {
         assert.expect(3);
 
         var youtubeURL = 'https://www.youtube.com/embed/FYqW0Gdwbzk';
-        var viewer = createViewer({
+        var viewer = await createViewer({
             attachmentID: 2,
             attachments: this.attachments,
             mockRPC: function (route) {
@@ -123,10 +124,10 @@ QUnit.module('DocumentViewer', {
         viewer.destroy();
     });
 
-    QUnit.test('Document Viewer html/(txt)', function (assert) {
+    QUnit.test('Document Viewer html/(txt)', async function (assert) {
         assert.expect(2);
 
-        var viewer = createViewer({
+        var viewer = await createViewer({
             attachmentID: 4,
             attachments: this.attachments,
         });
@@ -139,10 +140,10 @@ QUnit.module('DocumentViewer', {
         viewer.destroy();
     });
 
-    QUnit.test('Document Viewer mp4', function (assert) {
+    QUnit.test('Document Viewer mp4', async function (assert) {
         assert.expect(2);
 
-        var viewer = createViewer({
+        var viewer = await createViewer({
             attachmentID: 5,
             attachments: this.attachments,
         });
@@ -155,10 +156,10 @@ QUnit.module('DocumentViewer', {
         viewer.destroy();
     });
 
-    QUnit.test('Document Viewer jpg', function (assert) {
+    QUnit.test('Document Viewer jpg', async function (assert) {
         assert.expect(2);
 
-        var viewer = createViewer({
+        var viewer = await createViewer({
             attachmentID: 6,
             attachments: this.attachments,
         });
@@ -171,10 +172,10 @@ QUnit.module('DocumentViewer', {
         viewer.destroy();
     });
 
-    QUnit.test('is closable by button', function (assert) {
+    QUnit.test('is closable by button', async function (assert) {
         assert.expect(3);
 
-        var viewer = createViewer({
+        var viewer = await createViewer({
             attachmentID: 6,
             attachments: this.attachments,
         });
@@ -184,15 +185,15 @@ QUnit.module('DocumentViewer', {
         assert.containsOnce(viewer, '.o_close_btn',
             "should have a close button");
 
-        testUtils.dom.click(viewer.$('.o_close_btn'));
+        await testUtils.dom.click(viewer.$('.o_close_btn'));
 
         assert.ok(viewer.isDestroyed(), 'viewer should be destroyed');
     });
 
-    QUnit.test('is closable by clicking on the wrapper', function (assert) {
+    QUnit.test('is closable by clicking on the wrapper', async function (assert) {
         assert.expect(3);
 
-        var viewer = createViewer({
+        var viewer = await createViewer({
             attachmentID: 6,
             attachments: this.attachments,
         });
@@ -202,7 +203,7 @@ QUnit.module('DocumentViewer', {
         assert.containsOnce(viewer, '.o_viewer_img_wrapper',
             "should have a wrapper");
 
-        testUtils.dom.click(viewer.$('.o_viewer_img_wrapper'));
+        await testUtils.dom.click(viewer.$('.o_viewer_img_wrapper'));
 
         assert.ok(viewer.isDestroyed(), 'viewer should be destroyed');
     });