From 4ca8ba4bf6cb2ed0b6c780ee41d238fbe3b647da Mon Sep 17 00:00:00 2001 From: ivanahuckova Date: Mon, 13 Oct 2025 18:02:14 +0200 Subject: [PATCH] Fix test --- .../ExtensionSidebarProvider.test.tsx | 18 +++++++++++++++--- public/app/core/services/keybindingSrv.ts | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebarProvider.test.tsx b/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebarProvider.test.tsx index 66482a0edd2..7a5c599070e 100644 --- a/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebarProvider.test.tsx +++ b/public/app/core/components/AppChrome/ExtensionSidebar/ExtensionSidebarProvider.test.tsx @@ -19,9 +19,15 @@ const mockComponent = { targets: [], }; +const mockDifferentComponent = { + title: 'Different Component', + description: 'Different Description', + targets: [], +}; + const mockPluginMeta = { pluginId: 'grafana-investigations-app', - addedComponents: [mockComponent], + addedComponents: [mockComponent, mockDifferentComponent], addedLinks: [], }; @@ -419,7 +425,10 @@ describe('ExtensionSidebarProvider', () => { act(() => { // Find the ToggleExtensionSidebarEvent subscriber - const toggleEventSubscriberCall = subscribeSpy.mock.calls.find((call) => call[0] === ToggleExtensionSidebarEvent); + const toggleEventSubscriberCall = subscribeSpy.mock.calls + .slice() + .reverse() + .find((call) => call[0] === ToggleExtensionSidebarEvent); expect(toggleEventSubscriberCall).toBeDefined(); const [, subscriberFn] = toggleEventSubscriberCall!; @@ -466,7 +475,10 @@ describe('ExtensionSidebarProvider', () => { act(() => { // Find the ToggleExtensionSidebarEvent subscriber - const toggleEventSubscriberCall = subscribeSpy.mock.calls.find((call) => call[0] === ToggleExtensionSidebarEvent); + const toggleEventSubscriberCall = subscribeSpy.mock.calls + .slice() + .reverse() + .find((call) => call[0] === ToggleExtensionSidebarEvent); expect(toggleEventSubscriberCall).toBeDefined(); const [, subscriberFn] = toggleEventSubscriberCall!; diff --git a/public/app/core/services/keybindingSrv.ts b/public/app/core/services/keybindingSrv.ts index 84d7ba616a1..37f70eb6b9a 100644 --- a/public/app/core/services/keybindingSrv.ts +++ b/public/app/core/services/keybindingSrv.ts @@ -38,6 +38,7 @@ export class KeybindingSrv { } /** string for VizPanel key and number for panelId */ private panelId: string | number | null = null; + clearAndInitGlobalBindings(route: RouteDescriptor) { mousetrap.reset();