@@ -405,14 +406,14 @@ odoo.define('web.dropdown_menu_tests', function (require) {
assert.expect(5);
const items = this.items;
- class Parent extends owl.Component {
+ class Parent extends Component {
constructor() {
super(...arguments);
this.items = items;
}
}
Parent.components = { DropdownMenu };
- Parent.template = owl.tags.xml`
+ Parent.template = xml`
`;
diff --git a/addons/web/static/tests/legacy/core/owl_dialog_tests.js b/addons/web/static/tests/legacy/core/owl_dialog_tests.js
index 2b9a404275d..137468107d0 100644
--- a/addons/web/static/tests/legacy/core/owl_dialog_tests.js
+++ b/addons/web/static/tests/legacy/core/owl_dialog_tests.js
@@ -14,9 +14,8 @@ odoo.define('web.owl_dialog_tests', function (require) {
const { getFixture, nextTick, patchWithCleanup } = require("@web/../tests/helpers/utils");
const { createWebClient, doAction } = require("@web/../tests/webclient/helpers");
- const { Component, tags, useState, mount } = owl;
+ const { Component, mount, useState, xml } = owl;
const EscapeKey = { key: 'Escape', keyCode: 27, which: 27 };
- const { xml } = tags;
QUnit.module('core', {}, function () {
QUnit.module('OwlDialog');
@@ -283,7 +282,7 @@ odoo.define('web.owl_dialog_tests', function (require) {
let id = 1;
// OwlDialog env
- class OwlDialogWrapper extends owl.Component {
+ class OwlDialogWrapper extends Component {
setup() {
this.env = legacyEnv;
}
diff --git a/addons/web/static/tests/legacy/core/popover_tests.js b/addons/web/static/tests/legacy/core/popover_tests.js
index c94837e3bc2..62c8d458070 100644
--- a/addons/web/static/tests/legacy/core/popover_tests.js
+++ b/addons/web/static/tests/legacy/core/popover_tests.js
@@ -6,9 +6,7 @@ odoo.define('web.popover_tests', function (require) {
const testUtils = require('web.test_utils');
const { useEffect } = require("@web/core/utils/hooks");
- const { Component, tags, hooks } = owl;
- const { useRef, useState } = hooks;
- const { xml } = tags;
+ const { Component, useRef, useState, xml } = owl;
QUnit.module('core', {}, function () {
QUnit.module('Popover');
diff --git a/addons/web/static/tests/legacy/fields/relational_fields/field_one2many_tests.js b/addons/web/static/tests/legacy/fields/relational_fields/field_one2many_tests.js
index ef567a42631..1fe0307449a 100644
--- a/addons/web/static/tests/legacy/fields/relational_fields/field_one2many_tests.js
+++ b/addons/web/static/tests/legacy/fields/relational_fields/field_one2many_tests.js
@@ -24,6 +24,8 @@ const { FieldOne2Many } = relationalFields;
const AbstractFieldOwl = require('web.AbstractFieldOwl');
const fieldRegistryOwl = require('web.field_registry_owl');
+const { onMounted, onWillUnmount, xml } = owl;
+
QUnit.module('fields', {}, function () {
QUnit.module('relational_fields', {
@@ -9650,10 +9652,10 @@ QUnit.module('fields', {}, function () {
patch(ControlPanel.prototype, 'cp_patch_mock', {
setup() {
this._super(...arguments);
- owl.hooks.onMounted(() => {
+ onMounted(() => {
assert.step('mounted');
});
- owl.hooks.onWillUnmount(() => {
+ onWillUnmount(() => {
assert.step('willUnmount');
});
},
@@ -9881,7 +9883,7 @@ QUnit.module('fields', {}, function () {
QUnit.test("Editable list's field widgets call on_attach_callback on row update", async function (assert) {
// We use here a badge widget (owl component, does have a on_attach_callback method) and check its decoration
- // is properly managed in this scenario.
+ // is properly managed in this scenario.
assert.expect(3);
this.data.partner.records[0].p = [1, 2];
@@ -10036,11 +10038,11 @@ QUnit.module('fields', {}, function () {
setup() {
super.setup();
const ID = testInst++;
- owl.hooks.onMounted(() => {
+ onMounted(() => {
assert.step(`mounted ${ID}`);
});
- owl.hooks.onWillUnmount(() => {
+ onWillUnmount(() => {
assert.step(`willUnmount ${ID}`);
});
}
@@ -10049,7 +10051,7 @@ QUnit.module('fields', {}, function () {
}
}
- TestField.template = owl.tags.xml`
test`;
+ TestField.template = xml`
test`;
fieldRegistryOwl.add('test_field', TestField);
const def = testUtils.makeTestPromise();
diff --git a/addons/web/static/tests/legacy/helpers/test_env.js b/addons/web/static/tests/legacy/helpers/test_env.js
index e335d59616a..95cfafda502 100644
--- a/addons/web/static/tests/legacy/helpers/test_env.js
+++ b/addons/web/static/tests/legacy/helpers/test_env.js
@@ -6,6 +6,8 @@ odoo.define('web.test_env', async function (require) {
const session = require('web.session');
const { registerCleanup } = require("@web/../tests/helpers/cleanup");
+ const { Component, QWeb } = owl;
+
let qweb;
/**
@@ -21,7 +23,7 @@ odoo.define('web.test_env', async function (require) {
if (!qweb) {
// avoid parsing templates at every test because it takes a lot of
// time and they never change
- qweb = new owl.QWeb({ templates: session.owlTemplates });
+ qweb = new QWeb({ templates: session.owlTemplates });
}
registerCleanup(() => {
qweb.subscriptions = {};
@@ -98,10 +100,10 @@ odoo.define('web.test_env', async function (require) {
}
/**
- * Before each test, we want owl.Component.env to be a fresh test environment.
+ * Before each test, we want Component.env to be a fresh test environment.
*/
QUnit.on('OdooBeforeTestHook', function () {
- owl.Component.env = makeTestEnvironment();
+ Component.env = makeTestEnvironment();
});
return makeTestEnvironment;
diff --git a/addons/web/static/tests/legacy/helpers/test_utils_create.js b/addons/web/static/tests/legacy/helpers/test_utils_create.js
index 46513b1a211..934a9f49d44 100644
--- a/addons/web/static/tests/legacy/helpers/test_utils_create.js
+++ b/addons/web/static/tests/legacy/helpers/test_utils_create.js
@@ -21,9 +21,7 @@ odoo.define('web.test_utils_create', function (require) {
const testUtilsMock = require('web.test_utils_mock');
const Widget = require('web.Widget');
- const { Component } = owl;
- const { useRef, useState } = owl.hooks;
- const { xml } = owl.tags;
+ const { Component, useRef, useState, xml } = owl;
/**
* Similar as createView, but specific for calendar views. Some calendar
diff --git a/addons/web/static/tests/legacy/helpers/test_utils_dom.js b/addons/web/static/tests/legacy/helpers/test_utils_dom.js
index 9045377ab0e..cb4f09d9381 100644
--- a/addons/web/static/tests/legacy/helpers/test_utils_dom.js
+++ b/addons/web/static/tests/legacy/helpers/test_utils_dom.js
@@ -4,6 +4,8 @@ odoo.define('web.test_utils_dom', function (require) {
const concurrency = require('web.concurrency');
const Widget = require('web.Widget');
+ const { Component } = owl;
+
/**
* DOM Test Utils
*
@@ -368,7 +370,7 @@ odoo.define('web.test_utils_dom', function (require) {
*/
function getNode(target) {
let nodes;
- if (target instanceof owl.Component || target instanceof Widget) {
+ if (target instanceof Component || target instanceof Widget) {
nodes = [target.el];
} else if (typeof target === 'string') {
nodes = document.querySelectorAll(target);
diff --git a/addons/web/static/tests/legacy/helpers/test_utils_mock.js b/addons/web/static/tests/legacy/helpers/test_utils_mock.js
index 18fd39d49a4..4b7f29c0456 100644
--- a/addons/web/static/tests/legacy/helpers/test_utils_mock.js
+++ b/addons/web/static/tests/legacy/helpers/test_utils_mock.js
@@ -24,6 +24,7 @@ const RamStorage = require('web.RamStorage');
const session = require('web.session');
const { patchDate } = require("@web/../tests/helpers/utils");
+const { Component } = owl;
const DebouncedField = basic_fields.DebouncedField;
@@ -541,8 +542,8 @@ async function addMockEnvironment(widget, params) {
if (!('mockSRC' in params)) { // redirect src rpcs to the mock server
params.mockSRC = true;
}
- const cleanUp = await addMockEnvironmentOwl(owl.Component, params, mockServer);
- const env = owl.Component.env;
+ const cleanUp = await addMockEnvironmentOwl(Component, params, mockServer);
+ const env = Component.env;
// ensure to clean up everything when the widget will be destroyed
const destroy = widget.destroy;
diff --git a/addons/web/static/tests/legacy/owl_compatibility_tests.js b/addons/web/static/tests/legacy/owl_compatibility_tests.js
index e5b8e937c8c..019f7c7a21b 100644
--- a/addons/web/static/tests/legacy/owl_compatibility_tests.js
+++ b/addons/web/static/tests/legacy/owl_compatibility_tests.js
@@ -10,12 +10,11 @@ odoo.define('web.OwlCompatibilityTests', function (require) {
const testUtils = require('web.test_utils');
const Widget = require('web.Widget');
+ const { Component, useState, xml } = owl;
const makeTestPromise = testUtils.makeTestPromise;
const nextTick = testUtils.nextTick;
const addMockEnvironmentOwl = testUtils.mock.addMockEnvironmentOwl;
- const { Component, tags, useState } = owl;
- const { xml } = tags;
// from Owl internal status enum
const ISMOUNTED = 3;
diff --git a/addons/web/static/tests/legacy/views/abstract_controller_tests.js b/addons/web/static/tests/legacy/views/abstract_controller_tests.js
index 43b71b5293a..7daa6d40a89 100644
--- a/addons/web/static/tests/legacy/views/abstract_controller_tests.js
+++ b/addons/web/static/tests/legacy/views/abstract_controller_tests.js
@@ -1,7 +1,6 @@
odoo.define("base.abstract_controller_tests", function (require) {
"use strict";
-const { xml } = owl.tags;
var testUtils = require("web.test_utils");
var createView = testUtils.createView;
@@ -10,6 +9,8 @@ var BasicRenderer = require("web.BasicRenderer");
const AbstractRenderer = require('web.AbstractRendererOwl');
const RendererWrapper = require('web.RendererWrapper');
+const { xml } = owl;
+
function getHtmlRenderer(html) {
return BasicRenderer.extend({
start: function () {
diff --git a/addons/web/static/tests/legacy/views/basic_view_tests.js b/addons/web/static/tests/legacy/views/basic_view_tests.js
index f8adf2334bd..ce4f8bb5c8f 100644
--- a/addons/web/static/tests/legacy/views/basic_view_tests.js
+++ b/addons/web/static/tests/legacy/views/basic_view_tests.js
@@ -5,7 +5,8 @@ odoo.define('web.basic_view_tests', function (require) {
const BasicRenderer = require("web.BasicRenderer");
const testUtils = require('web.test_utils');
const widgetRegistryOwl = require('web.widgetRegistry');
- const { xml } = owl.tags;
+
+ const { Component, xml } = owl;
const createView = testUtils.createView;
@@ -42,7 +43,7 @@ odoo.define('web.basic_view_tests', function (require) {
})
});
- class MyWidget extends owl.Component {}
+ class MyWidget extends Component {}
MyWidget.fieldDependencies = {
foo: { type: 'char' },
bar: { type: 'boolean' },
diff --git a/addons/web/static/tests/legacy/views/form_tests.js b/addons/web/static/tests/legacy/views/form_tests.js
index 68c9bb299fb..48978dae13c 100644
--- a/addons/web/static/tests/legacy/views/form_tests.js
+++ b/addons/web/static/tests/legacy/views/form_tests.js
@@ -31,6 +31,8 @@ const { mapLegacyEnvToWowlEnv } = require("@web/legacy/utils");
const { registry } = require("@web/core/registry");
const { scrollerService } = require("@web/core/scroller_service");
+const { Component, xml } = owl;
+
let serverData;
QUnit.module('Views', {
beforeEach: async function () {
@@ -8346,12 +8348,12 @@ QUnit.module('Views', {
QUnit.test('basic support for widgets (being Owl Components)', async function (assert) {
assert.expect(1);
- class MyComponent extends owl.Component {
+ class MyComponent extends Component {
get value() {
return JSON.stringify(this.props.record.data);
}
}
- MyComponent.template = owl.tags.xml`
`;
+ MyComponent.template = xml`
`;
widgetRegistryOwl.add('test', MyComponent);
const form = await createView({
diff --git a/addons/web/static/tests/legacy/views/kanban_tests.js b/addons/web/static/tests/legacy/views/kanban_tests.js
index 05e2d5aeb4e..6e48dde3e58 100644
--- a/addons/web/static/tests/legacy/views/kanban_tests.js
+++ b/addons/web/static/tests/legacy/views/kanban_tests.js
@@ -20,6 +20,8 @@ var nextTick = testUtils.nextTick;
const cpHelpers = require('@web/../tests/search/helpers');
var createView = testUtils.createView;
+ const { Component, xml } = owl;
+
QUnit.module('Views', {
before: function () {
this._initialKanbanProgressBarAnimate = KanbanColumnProgressBar.prototype.ANIMATE;
@@ -6172,12 +6174,12 @@ QUnit.module('Views', {
QUnit.test('basic support for widgets (being Owl Components)', async function (assert) {
assert.expect(1);
- class MyComponent extends owl.Component {
+ class MyComponent extends Component {
get value() {
return JSON.stringify(this.props.record.data);
}
}
- MyComponent.template = owl.tags.xml`
`;
+ MyComponent.template = xml`
`;
widgetRegistryOwl.add('test', MyComponent);
const kanban = await createView({
diff --git a/addons/web/static/tests/legacy/views/list_tests.js b/addons/web/static/tests/legacy/views/list_tests.js
index e13882d2408..947d9b46027 100644
--- a/addons/web/static/tests/legacy/views/list_tests.js
+++ b/addons/web/static/tests/legacy/views/list_tests.js
@@ -1,33 +1,34 @@
odoo.define('web.list_tests', function (require) {
"use strict";
-var AbstractFieldOwl = require('web.AbstractFieldOwl');
-var AbstractStorageService = require('web.AbstractStorageService');
-var BasicModel = require('web.BasicModel');
-var core = require('web.core');
+const AbstractFieldOwl = require('web.AbstractFieldOwl');
+const AbstractStorageService = require('web.AbstractStorageService');
+const BasicModel = require('web.BasicModel');
+const core = require('web.core');
const Domain = require('web.Domain')
-var basicFields = require('web.basic_fields');
-var fieldRegistry = require('web.field_registry');
-var fieldRegistryOwl = require('web.field_registry_owl');
-var FormView = require('web.FormView');
-var ListRenderer = require('web.ListRenderer');
-var ListView = require('web.ListView');
-var mixins = require('web.mixins');
-var RamStorage = require('web.RamStorage');
-var testUtils = require('web.test_utils');
+const basicFields = require('web.basic_fields');
+const fieldRegistry = require('web.field_registry');
+const fieldRegistryOwl = require('web.field_registry_owl');
+const FormView = require('web.FormView');
+const ListRenderer = require('web.ListRenderer');
+const ListView = require('web.ListView');
+const mixins = require('web.mixins');
+const RamStorage = require('web.RamStorage');
+const testUtils = require('web.test_utils');
const { patch, unpatch } = require('web.utils');
-var widgetRegistry = require('web.widget_registry');
+const widgetRegistry = require('web.widget_registry');
const widgetRegistryOwl = require('web.widgetRegistry');
-var Widget = require('web.Widget');
-
-
-var _t = core._t;
+const Widget = require('web.Widget');
+const ControlPanel = require('web.ControlPanel');
+const ListController = require('web.ListController');
const cpHelpers = require('@web/../tests/search/helpers');
-var createView = testUtils.createView;
-
const { click, legacyExtraNextTick } = require("@web/../tests/helpers/utils");
const { createWebClient, doAction, loadState } = require('@web/../tests/webclient/helpers');
+const { Component, xml } = owl;
+const createView = testUtils.createView;
+const _t = core._t;
+
let serverData;
QUnit.module('Views', {
@@ -9303,12 +9304,12 @@ QUnit.module('Views', {
QUnit.test('basic support for widgets (being Owl Components)', async function (assert) {
assert.expect(1);
- class MyComponent extends owl.Component {
+ class MyComponent extends Component {
get value() {
return JSON.stringify(this.props.record.data);
}
}
- MyComponent.template = owl.tags.xml`
`;
+ MyComponent.template = xml`
`;
widgetRegistryOwl.add('test', MyComponent);
const list = await createView({
@@ -12129,7 +12130,7 @@ QUnit.module('Views', {
willUnmountCalls++;
}
}
- MyField.template = owl.tags.xml`
Hello World`;
+ MyField.template = xml`
Hello World`;
fieldRegistryOwl.add('my_owl_field', MyField);
const list = await createView({
@@ -12270,8 +12271,6 @@ QUnit.module('Views', {
});
QUnit.test("update control panel while list view is mounting", async function (assert) {
- const ControlPanel = require('web.ControlPanel');
- const ListController = require('web.ListController');
let mountedCounterCall = 0;
diff --git a/addons/web/static/tests/legacy/views/state_mapping_tests.js b/addons/web/static/tests/legacy/views/state_mapping_tests.js
index b6a2e522443..8e8734e8d22 100644
--- a/addons/web/static/tests/legacy/views/state_mapping_tests.js
+++ b/addons/web/static/tests/legacy/views/state_mapping_tests.js
@@ -25,6 +25,7 @@ import { mock } from "web.test_utils";
import legacyViewRegistry from "web.view_registry";
import { browser } from "@web/core/browser/browser";
+const { Component, xml } = owl;
const serviceRegistry = registry.category("services");
const viewRegistry = registry.category("views");
const searchModelRegistry = registry.category("search_models");
@@ -75,13 +76,13 @@ QUnit.module("Views", (hooks) => {
setupControlPanelServiceRegistry();
serviceRegistry.add("dialog", dialogService);
- class ToyView extends owl.Component {}
+ class ToyView extends Component {}
ToyView.components = { ControlPanel };
ToyView.display_name = _lt("Toy view");
ToyView.icon = "fab fa-android";
ToyView.multiRecord = true;
ToyView.searchMenuTypes = ["filter", "groupBy", "comparison", "favorite"];
- ToyView.template = owl.tags.xml`
+ ToyView.template = xml`
diff --git a/addons/web/static/tests/qunit.js b/addons/web/static/tests/qunit.js
index 45c8ec2b8dc..54a39b5e6c1 100644
--- a/addons/web/static/tests/qunit.js
+++ b/addons/web/static/tests/qunit.js
@@ -113,7 +113,7 @@
* - is unique
* - has the given attribute with the proper value
*
- * @param {Widget|jQuery|HTMLElement|owl.Component} w
+ * @param {Widget|jQuery|HTMLElement|Component} w
* @param {string} attr
* @param {string} value
* @param {string} [msg]
@@ -363,12 +363,12 @@
}
});
const oldError = QUnit.onError;
- QUnit.onError = err => {
- if (err.message === 'ResizeObserver loop limit exceeded') {
+ QUnit.onError = (err) => {
+ if (err.message === "ResizeObserver loop limit exceeded") {
return true;
}
return oldError(err);
- }
+ };
// -----------------------------------------------------------------------------
// Add sort button
diff --git a/addons/web/static/tests/search/custom_favorite_item_tests.js b/addons/web/static/tests/search/custom_favorite_item_tests.js
index 69e5d46b13a..e974da2b784 100644
--- a/addons/web/static/tests/search/custom_favorite_item_tests.js
+++ b/addons/web/static/tests/search/custom_favorite_item_tests.js
@@ -20,6 +20,7 @@ import {
validateSearch,
} from "./helpers";
+const { Component, xml } = owl;
const serviceRegistry = registry.category("services");
/**
@@ -159,7 +160,7 @@ QUnit.module("Search", (hooks) => {
QUnit.test("save filter", async function (assert) {
assert.expect(1);
- class TestComponent extends owl.Component {
+ class TestComponent extends Component {
setup() {
useSetupAction({
getContext: () => {
@@ -169,7 +170,7 @@ QUnit.module("Search", (hooks) => {
}
}
TestComponent.components = { FavoriteMenu };
- TestComponent.template = owl.tags.xml`
`;
+ TestComponent.template = xml`
`;
const comp = await makeWithSearch({
serverData,
diff --git a/addons/web/static/tests/search/favorite_menu_tests.js b/addons/web/static/tests/search/favorite_menu_tests.js
index fbde9572518..cceaa6d593d 100644
--- a/addons/web/static/tests/search/favorite_menu_tests.js
+++ b/addons/web/static/tests/search/favorite_menu_tests.js
@@ -19,6 +19,7 @@ import {
toggleMenuItem,
} from "./helpers";
+const { Component, xml } = owl;
const serviceRegistry = registry.category("services");
const viewRegistry = registry.category("views");
const favoriteMenuRegistry = registry.category("favoriteMenu");
@@ -129,7 +130,7 @@ QUnit.module("Search", (hooks) => {
async function (assert) {
assert.expect(7);
- class ToyView extends owl.Component {
+ class ToyView extends Component {
setup() {
assert.deepEqual(this.props.domain, [["foo", "=", "qsdf"]]);
}
@@ -138,7 +139,7 @@ QUnit.module("Search", (hooks) => {
}
}
ToyView.components = { FavoriteMenu, SearchBar };
- ToyView.template = owl.tags.xml`
+ ToyView.template = xml`
diff --git a/addons/web/static/tests/search/helpers.js b/addons/web/static/tests/search/helpers.js
index 406a626bdd2..26b92c07617 100644
--- a/addons/web/static/tests/search/helpers.js
+++ b/addons/web/static/tests/search/helpers.js
@@ -13,11 +13,10 @@ import { registerCleanup } from "../helpers/cleanup";
import { makeTestEnv } from "../helpers/mock_env";
import { click, getFixture, mouseEnter, triggerEvent } from "../helpers/utils";
+const { Component, mount } = owl;
const serviceRegistry = registry.category("services");
const favoriteMenuRegistry = registry.category("favoriteMenu");
-const { Component, mount } = owl;
-
export const setupControlPanelServiceRegistry = () => {
serviceRegistry.add("action", actionService);
serviceRegistry.add("hotkey", hotkeyService);
diff --git a/addons/web/static/tests/search/pager_hook_tests.js b/addons/web/static/tests/search/pager_hook_tests.js
index 67f4765d0c9..773852e0ba4 100644
--- a/addons/web/static/tests/search/pager_hook_tests.js
+++ b/addons/web/static/tests/search/pager_hook_tests.js
@@ -5,9 +5,7 @@ import { usePager } from "@web/search/pager_hook";
import { click } from "../helpers/utils";
import { makeWithSearch, setupControlPanelServiceRegistry } from "./helpers";
-const { Component } = owl;
-const { useState } = owl.hooks;
-const { xml } = owl.tags;
+const { Component, useState, xml } = owl;
let serverData;
QUnit.module("Search", (hooks) => {
diff --git a/addons/web/static/tests/search/search_model_tests.js b/addons/web/static/tests/search/search_model_tests.js
index 92333c830b4..6e96bbf1d02 100644
--- a/addons/web/static/tests/search/search_model_tests.js
+++ b/addons/web/static/tests/search/search_model_tests.js
@@ -4,8 +4,7 @@ import { patchDate } from "@web/../tests/helpers/utils";
import { makeWithSearch, setupControlPanelServiceRegistry } from "./helpers";
import { patchWithCleanup } from "@web/../tests/helpers/utils";
-const { Component, tags } = owl;
-const { xml } = tags;
+const { Component, xml } = owl;
class TestComponent extends Component {}
TestComponent.template = xml`
`;
diff --git a/addons/web/static/tests/search/search_panel_tests.js b/addons/web/static/tests/search/search_panel_tests.js
index 67aa1f8bbc5..6a08c5c0fc3 100644
--- a/addons/web/static/tests/search/search_panel_tests.js
+++ b/addons/web/static/tests/search/search_panel_tests.js
@@ -15,8 +15,7 @@ import { FilterMenu } from "@web/search/filter_menu/filter_menu";
import { GroupByMenu } from "@web/search/group_by_menu/group_by_menu";
import { SearchPanel } from "@web/search/search_panel/search_panel";
-const { Component, tags } = owl;
-const { xml } = tags;
+const { Component, xml } = owl;
const serviceRegistry = registry.category("services");
diff --git a/addons/web/static/tests/search/with_search_tests.js b/addons/web/static/tests/search/with_search_tests.js
index 97d18b94b9a..a832e4304db 100644
--- a/addons/web/static/tests/search/with_search_tests.js
+++ b/addons/web/static/tests/search/with_search_tests.js
@@ -17,9 +17,7 @@ import {
toggleMenuItem,
} from "./helpers";
-const { Component, hooks, mount, tags } = owl;
-const { useState } = hooks;
-const { xml } = tags;
+const { Component, mount, useState, xml } = owl;
const serviceRegistry = registry.category("services");
diff --git a/addons/web/static/tests/setup.js b/addons/web/static/tests/setup.js
index 81f95e1beca..bee413f6323 100644
--- a/addons/web/static/tests/setup.js
+++ b/addons/web/static/tests/setup.js
@@ -11,10 +11,10 @@ import { prepareRegistriesWithCleanup } from "./helpers/mock_env";
import { session as sessionInfo } from "@web/session";
import { prepareLegacyRegistriesWithCleanup } from "./helpers/legacy_env_utils";
-const { whenReady, loadFile } = owl.utils;
+const { QWeb, config, loadFile, whenReady } = owl;
-owl.config.enableTransitions = false;
-owl.QWeb.dev = true;
+config.enableTransitions = false;
+QWeb.dev = true;
function stringifyObjectValues(obj, properties) {
let res = "";
diff --git a/addons/web/static/tests/views/helpers.js b/addons/web/static/tests/views/helpers.js
index 7727cd52ca6..33cb0012951 100644
--- a/addons/web/static/tests/views/helpers.js
+++ b/addons/web/static/tests/views/helpers.js
@@ -7,7 +7,7 @@ import { getDefaultConfig, View } from "@web/views/view";
import { _fieldsViewGet } from "../helpers/mock_server";
import { addLegacyMockEnvironment } from "../webclient/helpers";
-const { mount } = owl;
+const { Component, mount } = owl;
/**
* @typedef {{
@@ -21,7 +21,7 @@ const { mount } = owl;
/**
* @param {MakeViewParams} params
- * @returns {owl.Component}
+ * @returns {Component}
*/
export const makeView = async (params) => {
const props = { ...params };
diff --git a/addons/web/static/tests/views/layout_tests.js b/addons/web/static/tests/views/layout_tests.js
index 61212fd3bc9..b6efb810ef8 100644
--- a/addons/web/static/tests/views/layout_tests.js
+++ b/addons/web/static/tests/views/layout_tests.js
@@ -8,9 +8,7 @@ import { Layout } from "@web/views/layout";
import { getDefaultConfig } from "@web/views/view";
import { makeTestEnv } from "@web/../tests/helpers/mock_env";
-const { Component, hooks, mount, tags } = owl;
-const { xml } = tags;
-const { useSubEnv } = hooks;
+const { Component, mount, useSubEnv, xml } = owl;
const serviceRegistry = registry.category("services");
diff --git a/addons/web/static/tests/views/view_tests.js b/addons/web/static/tests/views/view_tests.js
index 807bdd14f1b..761d3641b22 100644
--- a/addons/web/static/tests/views/view_tests.js
+++ b/addons/web/static/tests/views/view_tests.js
@@ -15,9 +15,7 @@ import { OnboardingBanner } from "@web/views/onboarding_banner";
import { View } from "@web/views/view";
import { actionService } from "@web/webclient/actions/action_service";
-const { Component, mount, hooks, tags } = owl;
-const { useState } = hooks;
-const { xml } = tags;
+const { Component, mount, useState, xml } = owl;
const serviceRegistry = registry.category("services");
const viewRegistry = registry.category("views");
diff --git a/addons/web/static/tests/webclient/actions/client_action_tests.js b/addons/web/static/tests/webclient/actions/client_action_tests.js
index ae4a33aa3c6..149160eccd7 100644
--- a/addons/web/static/tests/webclient/actions/client_action_tests.js
+++ b/addons/web/static/tests/webclient/actions/client_action_tests.js
@@ -9,7 +9,7 @@ import { registerCleanup } from "../../helpers/cleanup";
import { click, legacyExtraNextTick, patchWithCleanup } from "../../helpers/utils";
import { createWebClient, doAction, getActionManagerServerData } from "./../helpers";
-const { Component, tags } = owl;
+const { Component, xml } = owl;
let serverData;
const actionRegistry = registry.category("actions");
@@ -98,7 +98,7 @@ QUnit.module("ActionManager", (hooks) => {
QUnit.test("can execute client actions from tag name", async function (assert) {
assert.expect(4);
class ClientAction extends Component {}
- ClientAction.template = tags.xml`
Hello World
`;
+ ClientAction.template = xml`
Hello World
`;
actionRegistry.add("HelloWorldTest", ClientAction);
const mockRPC = async function (route, args) {
@@ -230,7 +230,7 @@ QUnit.module("ActionManager", (hooks) => {
QUnit.test("action can use a custom control panel (legacy)", async function (assert) {
assert.expect(1);
class CustomControlPanel extends Component {}
- CustomControlPanel.template = tags.xml`
+ CustomControlPanel.template = xml`
My custom control panel
`;
const ClientAction = AbstractAction.extend({
@@ -344,7 +344,7 @@ QUnit.module("ActionManager", (hooks) => {
this.env.config.setDisplayName(this.breadcrumbTitle);
}
}
- ClientAction.template = tags.xml`
owl client action
`;
+ ClientAction.template = xml`
owl client action
`;
actionRegistry.add("OwlClientAction", ClientAction);
const webClient = await createWebClient({ serverData });
await doAction(webClient, 8);
@@ -365,7 +365,7 @@ QUnit.module("ActionManager", (hooks) => {
assert.strictEqual(this.props.division, "bell");
}
}
- ClientAction.template = tags.xml`
`;
+ ClientAction.template = xml`
`;
actionRegistry.add("OwlClientAction", ClientAction);
const webClient = await createWebClient({ serverData });
await doAction(webClient, "OwlClientAction", {
diff --git a/addons/web/static/tests/webclient/actions/concurrency_tests.js b/addons/web/static/tests/webclient/actions/concurrency_tests.js
index 9dcb108e520..0ce2508781a 100644
--- a/addons/web/static/tests/webclient/actions/concurrency_tests.js
+++ b/addons/web/static/tests/webclient/actions/concurrency_tests.js
@@ -10,7 +10,7 @@ import testUtils from "web.test_utils";
import { useSetupView } from "@web/views/helpers/view_hook";
import * as cpHelpers from "@web/../tests/search/helpers";
-const { Component, tags } = owl;
+const { Component, xml } = owl;
const actionRegistry = registry.category("actions");
let serverData;
@@ -484,7 +484,7 @@ QUnit.module("ActionManager", (hooks) => {
return slowWillStartDef;
}
}
- ClientAction.template = tags.xml`
ClientAction
`;
+ ClientAction.template = xml`
ClientAction
`;
actionRegistry.add("slowAction", ClientAction);
const webClient = await createWebClient({ serverData });
doAction(webClient, "slowAction");
@@ -650,7 +650,7 @@ QUnit.module("ActionManager", (hooks) => {
ToyView.icon = "fab fa-android";
ToyView.multiRecord = true;
ToyView.searchMenuTypes = ["filter"];
- ToyView.template = owl.tags.xml`
+ ToyView.template = xml`
diff --git a/addons/web/static/tests/webclient/actions/error_handling_tests.js b/addons/web/static/tests/webclient/actions/error_handling_tests.js
index 541df6ef161..a7f96f8602e 100644
--- a/addons/web/static/tests/webclient/actions/error_handling_tests.js
+++ b/addons/web/static/tests/webclient/actions/error_handling_tests.js
@@ -6,7 +6,7 @@ import { registerCleanup } from "../../helpers/cleanup";
import { click, nextTick, patchWithCleanup } from "../../helpers/utils";
import { errorService } from "@web/core/errors/error_service";
-const { Component, tags } = owl;
+const { Component, xml } = owl;
let serverData;
const actionRegistry = registry.category("actions");
@@ -21,7 +21,7 @@ QUnit.module("ActionManager", (hooks) => {
QUnit.test("error in a client action (at rendering)", async function (assert) {
assert.expect(4);
class Boom extends Component {}
- Boom.template = tags.xml`
`;
+ Boom.template = xml`
`;
actionRegistry.add("Boom", Boom);
const webClient = await createWebClient({ serverData });
@@ -60,7 +60,7 @@ QUnit.module("ActionManager", (hooks) => {
this.render();
}
}
- Boom.template = tags.xml`
+ Boom.template = xml`
diff --git a/addons/web/static/tests/webclient/actions/load_state_tests.js b/addons/web/static/tests/webclient/actions/load_state_tests.js
index ad3fb12bed7..31d9ee36a75 100644
--- a/addons/web/static/tests/webclient/actions/load_state_tests.js
+++ b/addons/web/static/tests/webclient/actions/load_state_tests.js
@@ -26,7 +26,7 @@ import {
} from "./../helpers";
import { errorService } from "@web/core/errors/error_service";
-const { Component, mount, tags } = owl;
+const { Component, mount, xml } = owl;
let serverData;
@@ -181,7 +181,7 @@ QUnit.module("ActionManager", (hooks) => {
QUnit.test("properly load client actions", async function (assert) {
assert.expect(3);
class ClientAction extends Component {}
- ClientAction.template = tags.xml`
Hello World
`;
+ ClientAction.template = xml`
Hello World
`;
actionRegistry.add("HelloWorldTest", ClientAction);
const mockRPC = async function (route, args) {
assert.step((args && args.method) || route);
@@ -942,12 +942,12 @@ QUnit.module("ActionManager", (hooks) => {
serverData.views = {
...serverData.views,
- "partner,false,search":`
+ "partner,false,search": `
`,
- }
+ };
const webClient = await createWebClient({ serverData });
@@ -1021,7 +1021,7 @@ QUnit.module("ActionManager", (hooks) => {
browser.location.hash = "#action=__test__client__action__&menu_id=1";
}
}
- MyAction.template = tags.xml`
`;
+ MyAction.template = xml`
`;
registry.category("actions").add("myAction", MyAction);
browser.location.hash = "#action=myAction";
@@ -1052,7 +1052,7 @@ QUnit.module("ActionManager", (hooks) => {
window.dispatchEvent(new HashChangeEvent("hashchange", { newURL }));
}
}
- MyAction.template = tags.xml`
`;
+ MyAction.template = xml`
`;
registry.category("actions").add("myAction", MyAction);
browser.location.hash = "#action=myAction";
diff --git a/addons/web/static/tests/webclient/actions/push_state_tests.js b/addons/web/static/tests/webclient/actions/push_state_tests.js
index 1ebddc0244d..f8ae67bd364 100644
--- a/addons/web/static/tests/webclient/actions/push_state_tests.js
+++ b/addons/web/static/tests/webclient/actions/push_state_tests.js
@@ -7,7 +7,7 @@ import testUtils from "web.test_utils";
import { click, legacyExtraNextTick, nextTick, patchWithCleanup } from "../../helpers/utils";
import { createWebClient, doAction, getActionManagerServerData } from "./../helpers";
-const { Component, tags } = owl;
+const { Component, xml } = owl;
let serverData;
const actionRegistry = registry.category("actions");
@@ -77,7 +77,7 @@ QUnit.module("ActionManager", (hooks) => {
this.router.pushState({ arbitrary: "actionPushed" });
}
}
- ClientActionPushes.template = tags.xml`
+ ClientActionPushes.template = xml`
ClientAction_
`;
@@ -106,7 +106,7 @@ QUnit.module("ActionManager", (hooks) => {
this.router.pushState({ arbitrary: "actionPushed" });
}
}
- ClientActionPushes.template = tags.xml`
+ ClientActionPushes.template = xml`
ClientAction_
`;
@@ -136,7 +136,7 @@ QUnit.module("ActionManager", (hooks) => {
this.router.pushState({ arbitrary: "actionPushed" });
}
}
- ClientActionPushes.template = tags.xml`
+ ClientActionPushes.template = xml`
ClientAction_
`;
diff --git a/addons/web/static/tests/webclient/actions/target_tests.js b/addons/web/static/tests/webclient/actions/target_tests.js
index 7a0f9878564..4c72e67331e 100644
--- a/addons/web/static/tests/webclient/actions/target_tests.js
+++ b/addons/web/static/tests/webclient/actions/target_tests.js
@@ -11,6 +11,8 @@ import { errorService } from "@web/core/errors/error_service";
import { useService } from "@web/core/utils/hooks";
import { ClientErrorDialog } from "@web/core/errors/error_dialogs";
+const { Component, xml } = owl;
+
let serverData;
QUnit.module("ActionManager", (hooks) => {
@@ -340,19 +342,19 @@ QUnit.module("ActionManager", (hooks) => {
onUnhandledRejection: () => {},
});
- class ErrorClientAction extends owl.Component {
+ class ErrorClientAction extends Component {
setup() {
throw new Error("my error");
}
}
- ErrorClientAction.template = owl.tags.xml`
`;
+ ErrorClientAction.template = xml`
`;
registry.category("actions").add("failing", ErrorClientAction);
- class ClientActionTargetNew extends owl.Component {}
- ClientActionTargetNew.template = owl.tags.xml`
`;
+ class ClientActionTargetNew extends Component {}
+ ClientActionTargetNew.template = xml`
`;
registry.category("actions").add("clientActionNew", ClientActionTargetNew);
- class ClientAction extends owl.Component {
+ class ClientAction extends Component {
setup() {
this.action = useService("action");
}
@@ -367,7 +369,7 @@ QUnit.module("ActionManager", (hooks) => {
}
}
}
- ClientAction.template = owl.tags.xml`
`;
+ ClientAction.template = xml`
`;
registry.category("actions").add("clientAction", ClientAction);
const errorDialogOpened = makeDeferred();
diff --git a/addons/web/static/tests/webclient/actions/window_action_tests.js b/addons/web/static/tests/webclient/actions/window_action_tests.js
index 727b7abe3af..2400f5c3dc8 100644
--- a/addons/web/static/tests/webclient/actions/window_action_tests.js
+++ b/addons/web/static/tests/webclient/actions/window_action_tests.js
@@ -25,6 +25,8 @@ import { WarningDialog } from "@web/core/errors/error_dialogs";
import { makeFakeUserService } from "@web/../tests/helpers/mock_services";
import * as cpHelpers from "@web/../tests/search/helpers";
+const { onMounted } = owl;
+
let serverData;
const serviceRegistry = registry.category("services");
@@ -2348,7 +2350,7 @@ QUnit.module("ActionManager", (hooks) => {
class WarningDialogWait extends WarningDialog {
setup() {
super.setup();
- owl.hooks.onMounted(() => warningOpened.resolve());
+ onMounted(() => warningOpened.resolve());
}
}
diff --git a/addons/web/static/tests/webclient/helpers.js b/addons/web/static/tests/webclient/helpers.js
index a7bc85f3cf7..3e9c9b3b530 100644
--- a/addons/web/static/tests/webclient/helpers.js
+++ b/addons/web/static/tests/webclient/helpers.js
@@ -47,7 +47,7 @@ import { ClientActionAdapter, ViewAdapter } from "@web/legacy/action_adapters";
import { commandService } from "@web/core/commands/command_service";
import { CustomFavoriteItem } from "@web/search/favorite_menu/custom_favorite_item";
-const { Component, mount, tags } = owl;
+const { Component, mount, xml } = owl;
const actionRegistry = registry.category("actions");
const serviceRegistry = registry.category("services");
@@ -192,7 +192,7 @@ export function addLegacyMockEnvironment(env, legacyParams = {}) {
registerCleanup(() => (debouncedField.prototype.DEBOUNCE = initialDebouncedVal));
if (legacyParams.withLegacyMockServer) {
- const adapter = new ComponentAdapter(null, { Component: owl.Component });
+ const adapter = new ComponentAdapter(null, { Component: Component });
adapter.env = legacyEnv;
const W = Widget.extend({ do_push_state() {} });
const widget = new W(adapter);
@@ -308,7 +308,7 @@ export async function loadState(env, state) {
export function getActionManagerServerData() {
// additional basic client action
class TestClientAction extends Component {}
- TestClientAction.template = tags.xml`
+ TestClientAction.template = xml`
ClientAction_
`;
diff --git a/addons/web/static/tests/webclient/navbar_tests.js b/addons/web/static/tests/webclient/navbar_tests.js
index f373db3b765..44ee22fc9fe 100644
--- a/addons/web/static/tests/webclient/navbar_tests.js
+++ b/addons/web/static/tests/webclient/navbar_tests.js
@@ -11,8 +11,7 @@ import { NavBar } from "@web/webclient/navbar/navbar";
import { clearRegistryWithCleanup, makeTestEnv } from "../helpers/mock_env";
import { click, getFixture, nextTick, patchWithCleanup, makeDeferred } from "../helpers/utils";
-const { Component, mount, tags } = owl;
-const { xml } = tags;
+const { Component, mount, xml } = owl;
const systrayRegistry = registry.category("systray");
const serviceRegistry = registry.category("services");
@@ -427,7 +426,10 @@ QUnit.test("Do not execute adapt when navbar is destroyed", async (assert) => {
let prom = makeDeferred();
patchWithCleanup(browser, {
- setTimeout: async (handler, delay, ...args) => { await prom; return handler(...args); },
+ setTimeout: async (handler, delay, ...args) => {
+ await prom;
+ return handler(...args);
+ },
clearTimeout: () => {},
});
class MyNavbar extends NavBar {
diff --git a/addons/web/static/tests/webclient/webclient_tests.js b/addons/web/static/tests/webclient/webclient_tests.js
index 028df33cdbc..8c5a4a3750d 100644
--- a/addons/web/static/tests/webclient/webclient_tests.js
+++ b/addons/web/static/tests/webclient/webclient_tests.js
@@ -15,8 +15,7 @@ import { fakeTitleService } from "../helpers/mock_services";
import { getFixture, patchWithCleanup, triggerEvent } from "../helpers/utils";
import { session } from "@web/session";
-const { Component, tags, mount } = owl;
-const { xml } = tags;
+const { Component, mount, xml } = owl;
const mainComponentRegistry = registry.category("main_components");
const serviceRegistry = registry.category("services");
diff --git a/addons/web/tooling/types/qunit.d.ts b/addons/web/tooling/types/qunit.d.ts
index 95dad019a4c..833578cf434 100644
--- a/addons/web/tooling/types/qunit.d.ts
+++ b/addons/web/tooling/types/qunit.d.ts
@@ -1,4 +1,7 @@
// Type definitions for QUnit v2.9.2
+
+const { Component } = owl;
+
// Project: http://qunitjs.com/
// Definitions by: James Bracy
// Mike North
@@ -55,7 +58,7 @@ interface Assert {
* - is unique
* - has the given attribute with the proper value
*
- * @param {Widget|jQuery|HTMLElement|owl.Component} target
+ * @param {Widget|jQuery|HTMLElement|Component} target
*/
hasAttrValue(target: HTMLElement, attr: string, value: string, msg?: string): void;
diff --git a/addons/website/static/src/components/configurator/configurator.js b/addons/website/static/src/components/configurator/configurator.js
index cfd2fb6ed66..9a05ae35aac 100644
--- a/addons/website/static/src/components/configurator/configurator.js
+++ b/addons/website/static/src/components/configurator/configurator.js
@@ -9,10 +9,7 @@ import {_t, _lt} from 'web.core';
import {svgToPNG} from 'website.utils';
import {useService} from "@web/core/utils/hooks";
-const {Component, Store, mount, QWeb} = owl;
-const {useDispatch, useStore, useGetters, useRef} = owl.hooks;
-const {Router, RouteComponent} = owl.router;
-const {whenReady} = owl.utils;
+const { Component, QWeb, RouteComponent, Router, Store, loadFile, mount, useDispatch, useGetters, useRef, useStore, whenReady } = owl;
const WEBSITE_TYPES = {
1: {id: 1, label: _lt("a business website"), name: 'business'},
@@ -671,8 +668,8 @@ async function makeEnvironment() {
});
await session.is_bound;
const qweb = new QWeb({translateFn: _t});
- const loaderTemplate = await owl.utils.loadFile('/website/static/src/xml/theme_preview.xml');
- const configuratorTemplates = await owl.utils.loadFile('/website/static/src/components/configurator/configurator.xml');
+ const loaderTemplate = await loadFile('/website/static/src/xml/theme_preview.xml');
+ const configuratorTemplates = await loadFile('/website/static/src/components/configurator/configurator.xml');
qweb.addTemplates(loaderTemplate);
qweb.addTemplates(configuratorTemplates);
diff --git a/addons/website/static/src/js/menu/debug_menu.js b/addons/website/static/src/js/menu/debug_menu.js
index 9529ef1aa92..5b254f98cfe 100644
--- a/addons/website/static/src/js/menu/debug_menu.js
+++ b/addons/website/static/src/js/menu/debug_menu.js
@@ -3,6 +3,7 @@ import { registry } from "@web/core/registry";
import { DebugMenuBasic } from "@web/core/debug/debug_menu_basic";
import { createDebugContext } from "@web/core/debug/debug_context";
+const { mount } = owl;
const debugMenuService = {
dependencies: ["localization", "orm"],
start(env) {
@@ -10,7 +11,7 @@ const debugMenuService = {
const systray = document.querySelector('.o_menu_systray');
if (systray) {
Object.assign(env, createDebugContext(env, {categories: ["default"]}));
- owl.mount(DebugMenuBasic, {
+ mount(DebugMenuBasic, {
target: systray,
position: 'first-child',
env,