summaryrefslogtreecommitdiff
path: root/addons/mail_bot
diff options
context:
space:
mode:
authorSébastien Theys <seb@odoo.com>2020-08-28 12:53:38 +0000
committerSébastien Theys <seb@odoo.com>2020-08-28 16:15:15 +0000
commit17611f4adc5e950b0a75a2a6615b1da3c956387f (patch)
treeede6cbc0bc67c1dceed3b5ca6c1bb3e08389675c /addons/mail_bot
parent5ba64925fd846e9a9a4884913e3d1004d05ecdf6 (diff)
[FIX] mail, *: fix opens and redirects, adapt messaging menu close
task-2244279 task-2262862 task-2274993 task-2277537 task-2282238 closes odoo/odoo#56745 X-original-commit: 109f202 Related: odoo/enterprise#12761 Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com> Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Diffstat (limited to 'addons/mail_bot')
-rw-r--r--addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js3
-rw-r--r--addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer_tests.js14
2 files changed, 3 insertions, 14 deletions
diff --git a/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js b/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js
index 4118b5228ef..9b06fbbaa1c 100644
--- a/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js
+++ b/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer.js
@@ -12,9 +12,6 @@ registerInstancePatchModel('mail.messaging_initializer', 'mail_bot/static/src/mo
* @private
*/
async _initializeOdooBot() {
- await this.async(() => new Promise(resolve =>
- this.env.browser.setTimeout(resolve, 2 * 60 * 1000)
- ));
const data = await this.async(() => this.env.services.rpc({
model: 'mail.channel',
method: 'init_odoobot',
diff --git a/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer_tests.js b/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer_tests.js
index 4121cc5a277..bfb97067e90 100644
--- a/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer_tests.js
+++ b/addons/mail_bot/static/src/models/messaging_initializer/messaging_initializer_tests.js
@@ -24,10 +24,10 @@ QUnit.module('messaging_initializer_tests.js', {
});
-QUnit.test('OdooBot initialized after 2 minutes', async function (assert) {
+QUnit.test('OdooBot initialized at init', async function (assert) {
// TODO this test should be completed in combination with
// implementing _mockMailChannelInitOdooBot task-2300480
- assert.expect(3);
+ assert.expect(2);
await this.start({
env: {
@@ -35,7 +35,6 @@ QUnit.test('OdooBot initialized after 2 minutes', async function (assert) {
odoobot_initialized: false,
},
},
- hasTimeControl: true,
async mockRPC(route, args) {
if (args.method === 'init_odoobot') {
assert.step('init_odoobot');
@@ -44,16 +43,9 @@ QUnit.test('OdooBot initialized after 2 minutes', async function (assert) {
},
});
- await this.env.testUtils.advanceTime(119 * 1000);
- assert.verifySteps(
- [],
- "should not have initialized OdooBot after 1 minute 59 seconds"
- );
-
- await this.env.testUtils.advanceTime(1 * 1000);
assert.verifySteps(
['init_odoobot'],
- "should have initialized OdooBot after 2 minutes"
+ "should have initialized OdooBot at init"
);
});