From 8337dfd21b50f107359019e29864f74a729ed6e7 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 16 Dec 2021 07:05:57 +0200 Subject: [PATCH] Fix test that was accidentally broken Signed-off-by: Janne Savolainen --- .../components/+extensions/__tests__/extensions.test.tsx | 6 +++++- src/renderer/components/getDiForUnitTesting.tsx | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx index 284a05fee5..4ebdb6156f 100644 --- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -20,7 +20,7 @@ */ import "@testing-library/jest-dom/extend-expect"; -import { fireEvent, render, waitFor } from "@testing-library/react"; +import { fireEvent, waitFor } from "@testing-library/react"; import fse from "fs-extra"; import React from "react"; import { UserStore } from "../../../../common/user-store"; @@ -35,6 +35,7 @@ import { AppPaths } from "../../../../common/app-paths"; import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; +import { DiRender, renderFor } from "../../test-utils/renderFor"; mockWindow(); @@ -77,10 +78,13 @@ AppPaths.init(); describe("Extensions", () => { let extensionLoader: ExtensionLoader; + let render: DiRender; beforeEach(async () => { const di = getDiForUnitTesting(); + render = renderFor(di); + extensionLoader = di.inject(extensionLoaderInjectable); mockFs({ diff --git a/src/renderer/components/getDiForUnitTesting.tsx b/src/renderer/components/getDiForUnitTesting.tsx index 4e94d20dae..fefd120fb4 100644 --- a/src/renderer/components/getDiForUnitTesting.tsx +++ b/src/renderer/components/getDiForUnitTesting.tsx @@ -48,6 +48,7 @@ export const getDiForUnitTesting = () => { return di; }; -const getInjectableFilePaths = memoize(() => - glob.sync("./**/*.injectable.{ts,tsx}", { cwd: __dirname }), -); +const getInjectableFilePaths = memoize(() => [ + ...glob.sync("./**/*.injectable.{ts,tsx}", { cwd: __dirname }), + ...glob.sync("../../extensions/**/*.injectable.{ts,tsx}", { cwd: __dirname }), +]);