From 2f118c41fba6003798e2c105d7a94820e32280bb Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 31 Jan 2019 18:10:02 +0100 Subject: [PATCH] [FIX] web,mass_mailing: adapt forward-ported tests to new version --- addons/mass_mailing/tests/test_mass_mailing_shortener.py | 4 ++-- addons/web/static/tests/views/form_tests.js | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/mass_mailing/tests/test_mass_mailing_shortener.py b/addons/mass_mailing/tests/test_mass_mailing_shortener.py index 99e3de1e864..456498f3c74 100644 --- a/addons/mass_mailing/tests/test_mass_mailing_shortener.py +++ b/addons/mass_mailing/tests/test_mass_mailing_shortener.py @@ -27,8 +27,8 @@ class TestMassMailingShortener(common.TransactionCase): # 1px to avoid real request return 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8DwHwAFBQIAX8jx0gAAAABJRU5ErkJggg==' - patcher = patch('odoo.addons.link_tracker.models.link_tracker.link_tracker._compute_favicon', wraps=_compute_favicon) - patcher2 = patch('odoo.addons.link_tracker.models.link_tracker.link_tracker._get_title_from_url', wraps=_get_title_from_url) + patcher = patch('odoo.addons.link_tracker.models.link_tracker.LinkTracker._compute_favicon', wraps=_compute_favicon) + patcher2 = patch('odoo.addons.link_tracker.models.link_tracker.LinkTracker._get_title_from_url', wraps=_get_title_from_url) patcher.start() patcher2.start() self.addCleanup(patcher.stop) diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js index e0d0b8daa83..2b0ea28732e 100644 --- a/addons/web/static/tests/views/form_tests.js +++ b/addons/web/static/tests/views/form_tests.js @@ -16,7 +16,6 @@ var Widget = require('web.Widget'); var _t = core._t; var createView = testUtils.createView; -var createActionManager = testUtils.createActionManager; var createAsyncView = testUtils.createAsyncView; var createActionManager = testUtils.createActionManager; @@ -5679,9 +5678,9 @@ QUnit.module('Views', { actionManager.doAction(1); - actionManager.controlPanel.$el.find('.o_form_button_edit').click(); + actionManager.$('.o_form_button_edit').click(); actionManager.$('input[name="foo"]').val("test").trigger("input"); - actionManager.controlPanel.$el.find('.o_form_button_save').click(); + actionManager.$('.o_form_button_save').click(); assert.strictEqual(actionManager.$('.o_form_view > .alert > div').length, 1, "should have a translation alert");