From 96b4aac704a2e333f714f07260f701872e1e4db5 Mon Sep 17 00:00:00 2001 From: "Hubert Van de Walle (huvw)" Date: Mon, 12 Dec 2022 09:03:50 +0000 Subject: [PATCH] [FIX] web: conflict in qunit type definition In the QUnit type definitions, there is a QUnit namespace and a QUnit interface. When using a jetbrains IDE, it is confused between the two and thinks the global QUnit is the namespace. This means that it can't resolve QUnit.test, QUnit.module, etc This fixes this issue by disambiguating between the two. X-original-commit: 26dc799f841e51a6d57d427e095b662a45bc7e5a Part-of: odoo/odoo#107856 --- addons/web/tooling/types/qunit.d.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/web/tooling/types/qunit.d.ts b/addons/web/tooling/types/qunit.d.ts index 515c14ea6f3..b1b9e64f818 100644 --- a/addons/web/tooling/types/qunit.d.ts +++ b/addons/web/tooling/types/qunit.d.ts @@ -460,7 +460,7 @@ interface Assert { ) => void; type ModuleOnly = { only: moduleFunc1 & moduleFunc2 }; - declare namespace QUnit { + declare namespace QUnitNamespace { interface BeginDetails { totalTests: number; } @@ -523,7 +523,7 @@ interface Assert { * * @callback callback Callback to execute. */ - begin(callback: (details: QUnit.BeginDetails) => void | Promise): void; + begin(callback: (details: QUnitNamespace.BeginDetails) => void | Promise): void; /** * Configuration for QUnit @@ -538,7 +538,7 @@ interface Assert { * * @param callback Callback to execute */ - done(callback: (details: QUnit.DoneDetails) => void | Promise): void; + done(callback: (details: QUnitNamespace.DoneDetails) => void | Promise): void; /** * Advanced and extensible data dumping for JavaScript. @@ -582,7 +582,7 @@ interface Assert { * * @param callback Callback to execute */ - log(callback: (details: QUnit.LogDetails) => void): void; + log(callback: (details: QUnitNamespace.LogDetails) => void): void; /** * Group related tests under a single label. @@ -630,7 +630,7 @@ interface Assert { * @param callback Callback to execute */ moduleDone( - callback: (details: QUnit.ModuleDoneDetails) => void | Promise + callback: (details: QUnitNamespace.ModuleDoneDetails) => void | Promise ): void; /** @@ -639,7 +639,7 @@ interface Assert { * @param callback Callback to execute */ moduleStart( - callback: (details: QUnit.ModuleStartDetails) => void | Promise + callback: (details: QUnitNamespace.ModuleStartDetails) => void | Promise ): void; /** @@ -759,7 +759,7 @@ interface Assert { * @param callback Callback to execute */ testStart( - callback: (details: QUnit.TestStartDetails) => void | Promise + callback: (details: QUnitNamespace.TestStartDetails) => void | Promise ): void; /**