summaryrefslogtreecommitdiff
path: root/addons/web/static/tests/core
diff options
context:
space:
mode:
authorBenjamin Vray <bvr@odoo.com>2020-06-30 13:23:31 +0000
committerqsm-odoo <qsm@odoo.com>2020-06-30 14:19:17 +0000
commit58179cebf19b78b6c0feeac0edf7f30f49ad41bb (patch)
tree1f767fe9cefbf4147d0f5b86c969e675ba2bfb18 /addons/web/static/tests/core
parent4341a4d79571047bee3ab7560cd6d7fceb1368ad (diff)
[IMP] web, *: replace the bootstrap backdrop element with a bg on modals
*: web_editor Do not display the backdrop element added by bootstrap in the body and add a background on the modal to keep the same effect. The bootstrap backdrop was probably useful for compatibility with <IE9 but is no longer needed. This also avoids z-index issues because modals could be opened in an element (e.g. the website #wrapwrap) whose stacking context is different of the body one (where the backdrop is opened). This would make the backdrop appears on top of the modal. Part of https://github.com/odoo/odoo/pull/49142 Related to task-2229551 Co-authored-by: qsm-odoo <qsm@odoo.com>
Diffstat (limited to 'addons/web/static/tests/core')
-rw-r--r--addons/web/static/tests/core/owl_dialog_tests.js16
1 files changed, 9 insertions, 7 deletions
diff --git a/addons/web/static/tests/core/owl_dialog_tests.js b/addons/web/static/tests/core/owl_dialog_tests.js
index 3f287a5ada4..cddb7ac7244 100644
--- a/addons/web/static/tests/core/owl_dialog_tests.js
+++ b/addons/web/static/tests/core/owl_dialog_tests.js
@@ -14,7 +14,7 @@ odoo.define('web.owl_dialog_tests', function (require) {
QUnit.module('OwlDialog');
QUnit.test("Rendering of all props", async function (assert) {
- assert.expect(33);
+ assert.expect(35);
class SubComponent extends Component {
// Handlers
@@ -69,7 +69,6 @@ odoo.define('web.owl_dialog_tests', function (require) {
}
// Basic layout with default properties
- assert.containsOnce(dialog, '.modal-backdrop.show');
assert.containsOnce(dialog, '.modal.o_technical_modal');
assert.hasClass(dialog.querySelector('.modal .modal-dialog'), 'modal-lg');
assert.containsOnce(dialog, '.modal-header > button.close');
@@ -81,23 +80,26 @@ odoo.define('web.owl_dialog_tests', function (require) {
// Static backdrop click should focus first button
// => we need to reset that property
dialog.querySelector('.btn-primary').blur(); // Remove the focus explicitely
- assert.containsOnce(document.body, '.modal-backdrop');
- await testUtils.dom.click(dialog.querySelector('.modal-backdrop'));
+ assert.containsNone(document.body, '.modal-backdrop'); // No backdrop *element* for Odoo modal...
+ assert.notEqual(window.getComputedStyle(dialog.querySelector('.modal')).backgroundColor, 'rgba(0, 0, 0, 0)'); // ... but a non transparent modal
+ await testUtils.dom.click(dialog.querySelector('.modal'));
assert.strictEqual(document.activeElement, dialog.querySelector('.btn-primary'),
"Button should be focused when clicking on backdrop");
assert.verifySteps([]); // Ensure not closed
dialog.querySelector('.btn-primary').blur(); // Remove the focus explicitely
await changeProps('backdrop', false);
- assert.containsNone(document.body, '.modal-backdrop');
+ assert.containsNone(document.body, '.modal-backdrop'); // No backdrop *element* for Odoo modal...
+ assert.strictEqual(window.getComputedStyle(dialog.querySelector('.modal')).backgroundColor, 'rgba(0, 0, 0, 0)');
await testUtils.dom.click(dialog.querySelector('.modal'));
assert.notEqual(document.activeElement, dialog.querySelector('.btn-primary'),
"Button should not be focused when clicking on backdrop 'false'");
assert.verifySteps([]); // Ensure not closed
await changeProps('backdrop', true);
- assert.containsOnce(document.body, '.modal-backdrop');
- await testUtils.dom.click(dialog.querySelector('.modal-backdrop'));
+ assert.containsNone(document.body, '.modal-backdrop'); // No backdrop *element* for Odoo modal...
+ assert.notEqual(window.getComputedStyle(dialog.querySelector('.modal')).backgroundColor, 'rgba(0, 0, 0, 0)'); // ... but a non transparent modal
+ await testUtils.dom.click(dialog.querySelector('.modal'));
assert.notEqual(document.activeElement, dialog.querySelector('.btn-primary'),
"Button should not be focused when clicking on backdrop 'true'");
assert.verifySteps(['dialog_closed']);