summaryrefslogtreecommitdiff
path: root/addons/mail/static/tests/thread_window
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2020-06-05 09:18:14 +0000
committerAaron Bohy <aab@odoo.com>2020-06-12 09:47:48 +0000
commitb4ba0fc34082deec8ca6c871ce7a203c0a3a61a4 (patch)
tree27451423f32b218e699d3135c398d338b249c5cd /addons/mail/static/tests/thread_window
parentdc260c324170a90fa737cd21dd528e39d658d9b6 (diff)
[FIX] *: adapt tests to env rework
This commit adapts tests following recent changes on the helpers. The main change is that addMockEnvironment (and all functions using it) are now async, as they need to wait for services to be started.
Diffstat (limited to 'addons/mail/static/tests/thread_window')
-rw-r--r--addons/mail/static/tests/thread_window/basic_thread_window_tests.js30
-rw-r--r--addons/mail/static/tests/thread_window/blank_thread_window_tests.js14
-rw-r--r--addons/mail/static/tests/thread_window/hidden_thread_window_tests.js10
-rw-r--r--addons/mail/static/tests/thread_window/moderation_thread_window_tests.js6
-rw-r--r--addons/mail/static/tests/thread_window/typing_thread_window_tests.js6
5 files changed, 33 insertions, 33 deletions
diff --git a/addons/mail/static/tests/thread_window/basic_thread_window_tests.js b/addons/mail/static/tests/thread_window/basic_thread_window_tests.js
index 87e3c536998..61414d2aeaa 100644
--- a/addons/mail/static/tests/thread_window/basic_thread_window_tests.js
+++ b/addons/mail/static/tests/thread_window/basic_thread_window_tests.js
@@ -56,7 +56,7 @@ QUnit.module('Basic', {
this.services = mailTestUtils.getMailServices();
this.ORIGINAL_THREAD_WINDOW_APPENDTO = this.services.mail_service.prototype.THREAD_WINDOW_APPENDTO;
- this.createParent = function (params) {
+ this.createParent = async function (params) {
var widget = new Widget();
// in non-debug mode, append thread windows in qunit-fixture
@@ -68,7 +68,7 @@ QUnit.module('Basic', {
self.services.mail_service.prototype.THREAD_WINDOW_APPENDTO = '#qunit-fixture';
}
- testUtils.mock.addMockEnvironment(widget, params);
+ await testUtils.mock.addMockEnvironment(widget, params);
return widget;
};
},
@@ -81,7 +81,7 @@ QUnit.module('Basic', {
QUnit.test('basic rendering thread window', async function (assert) {
assert.expect(10);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -128,7 +128,7 @@ QUnit.test('basic rendering thread window', async function (assert) {
QUnit.test('close thread window using ESCAPE key', async function (assert) {
assert.expect(5);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
mockRPC: function (route, args) {
@@ -169,7 +169,7 @@ QUnit.test('close thread window using ESCAPE key', async function (assert) {
QUnit.test('thread window\'s input can still be focused when the UI is blocked', async function (assert) {
assert.expect(2);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -205,7 +205,7 @@ QUnit.test('thread window\'s input can still be focused when the UI is blocked',
QUnit.test('emoji popover should open correctly in thread windows', async function (assert) {
assert.expect(1);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -227,7 +227,7 @@ QUnit.test('emoji popover should open correctly in thread windows', async functi
QUnit.test('do not increase unread counter when receiving message with myself as author', async function (assert) {
assert.expect(4);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
session: { partner_id: 3 }
@@ -274,7 +274,7 @@ QUnit.test('do not increment unread counter with focus on thread window', async
// order to set the focus on it.
assert.expect(2);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
session: { partner_id: 3 }
@@ -322,7 +322,7 @@ QUnit.test('do not mark as read the newly open thread window from received messa
message_unread_counter: 0,
}];
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
session: { partner_id: 3 },
@@ -393,7 +393,7 @@ QUnit.test('show document link of message linked to a document', async function
channel_type: "public",
});
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
session: { partner_id: 3 },
@@ -510,7 +510,7 @@ QUnit.test('do not auto-focus chat window on receiving new message from new DM',
state: 'open',
}];
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
session: { partner_id: 3 },
@@ -600,7 +600,7 @@ QUnit.test('no out-of-office status in thread window', async function (assert) {
}],
},
};
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -650,7 +650,7 @@ QUnit.test('receive 2 new DM messages in quick succession (no chat window initia
}],
};
- const parent = this.createParent({
+ const parent = await this.createParent({
data: this.data,
mockRPC(route, args) {
if (args.method === 'channel_minimize') {
@@ -740,7 +740,7 @@ QUnit.test('non-deletable message attachments', async function (assert) {
record_name: "general",
res_id: 1,
}];
- const parent = this.createParent({
+ const parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -781,7 +781,7 @@ QUnit.test('join channel from click channel mention', async function (assert) {
channel_ids: [1],
});
- const parent = this.createParent({
+ const parent = await this.createParent({
data: this.data,
services: this.services,
session: { partner_id: 3 },
diff --git a/addons/mail/static/tests/thread_window/blank_thread_window_tests.js b/addons/mail/static/tests/thread_window/blank_thread_window_tests.js
index 4a24a80d4c3..2d295144b62 100644
--- a/addons/mail/static/tests/thread_window/blank_thread_window_tests.js
+++ b/addons/mail/static/tests/thread_window/blank_thread_window_tests.js
@@ -32,7 +32,7 @@ QUnit.module('Blank', {
this.services = mailTestUtils.getMailServices();
this.ORIGINAL_THREAD_WINDOW_APPENDTO = this.services.mail_service.prototype.THREAD_WINDOW_APPENDTO;
- this.createParent = function (params) {
+ this.createParent = async function (params) {
var widget = new Widget();
// in non-debug mode, append thread windows in qunit-fixture
@@ -44,7 +44,7 @@ QUnit.module('Blank', {
self.services.mail_service.prototype.THREAD_WINDOW_APPENDTO = '#qunit-fixture';
}
- testUtils.mock.addMockEnvironment(widget, params);
+ await testUtils.mock.addMockEnvironment(widget, params);
return widget;
};
@@ -90,7 +90,7 @@ QUnit.module('Blank', {
QUnit.test('basic rendering blank thread window', async function (assert) {
assert.expect(5);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -117,7 +117,7 @@ QUnit.test('basic rendering blank thread window', async function (assert) {
QUnit.test('close blank thread window', async function (assert) {
assert.expect(1);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -139,7 +139,7 @@ QUnit.test('fold blank thread window', async function (assert) {
// (e.g. 400px)
assert.expect(3);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -191,7 +191,7 @@ QUnit.test('open new DM chat from blank thread window', async function (assert)
records: [],
};
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
mockRPC: function (route, args) {
@@ -274,7 +274,7 @@ QUnit.test('open already detached DM chat from blank thread window', async funct
name: 'DemoUser1',
}];
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
mockRPC: function (route, args) {
diff --git a/addons/mail/static/tests/thread_window/hidden_thread_window_tests.js b/addons/mail/static/tests/thread_window/hidden_thread_window_tests.js
index 078230e276a..36da266128c 100644
--- a/addons/mail/static/tests/thread_window/hidden_thread_window_tests.js
+++ b/addons/mail/static/tests/thread_window/hidden_thread_window_tests.js
@@ -31,7 +31,7 @@ QUnit.module('Hidden', {
this.services = mailTestUtils.getMailServices();
this.ORIGINAL_THREAD_WINDOW_APPENDTO = this.services.mail_service.prototype.THREAD_WINDOW_APPENDTO;
- this.createParent = function (params) {
+ this.createParent = async function (params) {
var widget = new Widget();
// in non-debug mode, append thread windows in qunit-fixture
@@ -43,7 +43,7 @@ QUnit.module('Hidden', {
self.services.mail_service.prototype.THREAD_WINDOW_APPENDTO = '#qunit-fixture';
}
- testUtils.mock.addMockEnvironment(widget, params);
+ await testUtils.mock.addMockEnvironment(widget, params);
return widget;
};
},
@@ -86,7 +86,7 @@ QUnit.test('hidden thread windows dropdown when not enough horizontal space (ver
},
};
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -172,7 +172,7 @@ QUnit.test('hidden thread windows dropdown when not enough horizontal space (ver
},
};
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
@@ -266,7 +266,7 @@ QUnit.test('receive message from hidden thread window', async function (assert)
},
};
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
diff --git a/addons/mail/static/tests/thread_window/moderation_thread_window_tests.js b/addons/mail/static/tests/thread_window/moderation_thread_window_tests.js
index 732a5fe7938..db2561fd048 100644
--- a/addons/mail/static/tests/thread_window/moderation_thread_window_tests.js
+++ b/addons/mail/static/tests/thread_window/moderation_thread_window_tests.js
@@ -62,7 +62,7 @@ QUnit.module('Moderation', {
this.services = mailTestUtils.getMailServices();
this.ORIGINAL_THREAD_WINDOW_APPENDTO = this.services.mail_service.prototype.THREAD_WINDOW_APPENDTO;
- this.createParent = function (params) {
+ this.createParent = async function (params) {
var widget = new Widget();
// in non-debug mode, append thread windows in qunit-fixture
@@ -74,7 +74,7 @@ QUnit.module('Moderation', {
self.services.mail_service.prototype.THREAD_WINDOW_APPENDTO = '#qunit-fixture';
}
- testUtils.mock.addMockEnvironment(widget, params);
+ await testUtils.mock.addMockEnvironment(widget, params);
return widget;
};
},
@@ -110,7 +110,7 @@ QUnit.test('moderator: moderated channel with pending moderation message', async
res_id: 1,
}];
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
});
diff --git a/addons/mail/static/tests/thread_window/typing_thread_window_tests.js b/addons/mail/static/tests/thread_window/typing_thread_window_tests.js
index be2bd4beec8..53960dc283d 100644
--- a/addons/mail/static/tests/thread_window/typing_thread_window_tests.js
+++ b/addons/mail/static/tests/thread_window/typing_thread_window_tests.js
@@ -51,7 +51,7 @@ QUnit.module('Typing', {
await testUtils.nextMicrotaskTick();
};
- this.createParent = function (params) {
+ this.createParent = async function (params) {
var widget = new Widget();
// in non-debug mode, append thread windows in qunit-fixture
@@ -63,7 +63,7 @@ QUnit.module('Typing', {
self.services.mail_service.prototype.THREAD_WINDOW_APPENDTO = '#qunit-fixture';
}
- testUtils.mock.addMockEnvironment(widget, params);
+ await testUtils.mock.addMockEnvironment(widget, params);
return widget;
};
},
@@ -76,7 +76,7 @@ QUnit.module('Typing', {
QUnit.test('receive typing notification', async function (assert) {
assert.expect(4);
- var parent = this.createParent({
+ var parent = await this.createParent({
data: this.data,
services: this.services,
mockRPC: function (route, args) {