From 0d469f1b28dcd92fe781c6f9b5b371a2795dbbd5 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Fri, 17 Jun 2022 16:09:58 +0300 Subject: [PATCH] Make unit tests for tray behave correctly when item is disabled Signed-off-by: Janne Savolainen --- .../tray-menu-item/tray-menu-item-registrator.injectable.ts | 2 +- .../components/test-utils/get-application-builder.tsx | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts b/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts index 86d57c541c..3a0f54220a 100644 --- a/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts +++ b/src/main/tray/tray-menu-item/tray-menu-item-registrator.injectable.ts @@ -72,7 +72,7 @@ const toItemInjectablesFor = (extension: LensMainExtension, installationCounter: return decorated(registration); }, - enabled: computed(() => !!registration.enabled), + enabled: computed(() => registration.enabled ?? true), visible: computed(() => true), extension, diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 7b526123d9..9a1b3ea4a4 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -317,6 +317,10 @@ export const getApplicationBuilder = () => { throw new Error(`Tried to click tray menu item with ID ${id} which does not exist. Available IDs are: "${availableIds}"`); } + if (!menuItem.enabled.get()) { + throw new Error(`Tried to click tray menu item with ID ${id} which is disabled.`); + } + await menuItem.click?.(); }, },