From edae92c880cd095ce56a95c8a7b3204ab3602d64 Mon Sep 17 00:00:00 2001
From: Vincent Schippefilt <vsc@odoo.com>
Date: Wed, 6 Mar 2019 14:02:20 +0100
Subject: [PATCH] [REF] mrp: 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>
---
 addons/mrp/static/src/js/mrp.js      |  2 +-
 addons/mrp/static/tests/mrp_tests.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/mrp/static/src/js/mrp.js b/addons/mrp/static/src/js/mrp.js
index 154b65ce473..f9045ee2833 100644
--- a/addons/mrp/static/src/js/mrp.js
+++ b/addons/mrp/static/src/js/mrp.js
@@ -68,7 +68,7 @@ var TimeCounter = AbstractField.extend({
                 });
             }
         });
-        return $.when(this._super.apply(this, arguments), def);
+        return Promise.all([this._super.apply(this, arguments), def]);
     },
 
     destroy: function () {
diff --git a/addons/mrp/static/tests/mrp_tests.js b/addons/mrp/static/tests/mrp_tests.js
index 7e548234bb1..c8a38be42c3 100644
--- a/addons/mrp/static/tests/mrp_tests.js
+++ b/addons/mrp/static/tests/mrp_tests.js
@@ -29,10 +29,10 @@ QUnit.module('mrp', {
     },
 }, function () {
 
-    QUnit.test("bullet_state: basic rendering", function (assert) {
+    QUnit.test("bullet_state: basic rendering", async function (assert) {
         assert.expect(2);
 
-        var form = createView({
+        var form = await createView({
             View: FormView,
             model: 'partner',
             data: this.data,
@@ -51,10 +51,10 @@ QUnit.module('mrp', {
         form.destroy();
     });
 
-    QUnit.test("mrp_time_counter: basic rendering", function (assert) {
+    QUnit.test("mrp_time_counter: basic rendering", async function (assert) {
         assert.expect(2);
 
-        var form = createView({
+        var form = await createView({
             View: FormView,
             model: 'partner',
             data: this.data,
@@ -66,7 +66,7 @@ QUnit.module('mrp', {
             mockRPC: function (route, args) {
                 if (args.method === 'search_read' && args.model === 'mrp.workcenter.productivity') {
                     assert.ok(true, "the widget should fetch the mrp.workcenter.productivity");
-                    return $.when([{
+                    return Promise.resolve([{
                         date_start: '2017-01-01 08:00:00',
                         date_end: '2017-01-01 10:00:00',
                     }, {