Sort out mocking file access methods

src/renderer/components/modals/ProjectSettingsModal/ProjectSettingsModal.test.tsx

@@ -1,8 +1,8 @@
 import { screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import FileManager from "../../../services/fileManager/FileManager";
 import { renderWithProviders } from "../../../testing/TestHelper";
 import ProjectSettingsModal from "./ProjectSettingsModal";
+import { mockGetWorkingDirectory, mockOpenDirectoryDialog } from "../../../testing/mockFileAccess";
 
 const getModal = () => screen.getByRole("dialog");
 const modalTitle = () => screen.getByRole("heading");
@@ -40,9 +40,9 @@ describe("new project", () => {
 
   it("should be able to fill in and submit form ", async () => {
     const workingDirectoryName = "dirname";
-    // const mockOpenDirectoryDialog = jest
-    //   .spyOn(FileManager, "openDirectoryDialogHandleCancel")
-    //   .mockImplementation(() => Promise.resolve({ name: workingDirectoryName }) as any);
+    const mockedOpenDirectoryDialog = mockOpenDirectoryDialog(workingDirectoryName);
+    mockGetWorkingDirectory();
+
     renderWithProviders(<ProjectSettingsModal />);
 
     await userEvent.type(nameInput(), "My Movie");
@@ -52,8 +52,7 @@ describe("new project", () => {
 
     await userEvent.click(chooseFolderButton());
 
-    // expect(mockOpenDirectoryDialog).toHaveBeenCalledWith("changeWorkingDirectory");
-
+    expect(mockedOpenDirectoryDialog).toHaveBeenCalledWith("changeWorkingDirectory");
     await waitFor(() =>
       expect(directoryPathInput()).toHaveValue(`./${workingDirectoryName}/My-Movie.bafiles`)
     );

src/renderer/components/modals/ProjectSettingsModal/ProjectSettingsModal.tsx

@@ -49,8 +49,6 @@ const ProjectSettingsModal = (): JSXElementWithTestIds => {
     const workingDirectoryHandle =
       await FileManager.openDirectoryDialogHandleCancel("changeWorkingDirectory");
 
-    console.log("handle");
-
     if (workingDirectoryHandle !== undefined) {
       await putOrAddWorkingDirectory(workingDirectoryHandle);
     }

src/renderer/hooks/useProjectDirectory.ts

@@ -3,7 +3,7 @@ import { db } from "../services/database/Database";
 import { useSelector } from "react-redux";
 import { RootState } from "../redux/store";
 
-const useWorkingDirectory = () => {
+const useProjectDirectory = () => {
   const projectDirectoryId = useSelector((state: RootState) => state.project.projectDirectoryId);
   const recentDirectoryEntry = useLiveQuery(
     () => db.recentDirectories.get(projectDirectoryId ?? ""),
@@ -13,4 +13,4 @@ const useWorkingDirectory = () => {
   return recentDirectoryEntry;
 };
 
-export default useWorkingDirectory;
+export default useProjectDirectory;

src/renderer/testing/mockFileAccess.ts

@@ -0,0 +1,21 @@
+import { v4 as uuidv4 } from "uuid";
+import * as RecentDirectoryEntry from "../services/database/RecentDirectoryEntry";
+import FileManager from "../services/fileManager/FileManager";
+
+export const mockOpenDirectoryDialog = (selectedDirectoryName: string) =>
+  jest
+    .spyOn(FileManager, "openDirectoryDialogHandleCancel")
+    .mockImplementation(() => Promise.resolve({ name: selectedDirectoryName }) as any);
+
+export const mockGetWorkingDirectory = () =>
+  jest.spyOn(RecentDirectoryEntry, "getWorkingDirectory").mockImplementation(() =>
+    Promise.resolve({
+      id: uuidv4(),
+      type: RecentDirectoryEntry.RecentDirectoryType.WORKING_DIRECTORY,
+      friendlyName: "My Working Directory",
+      handle: {
+        name: "working-directory",
+        getDirectoryHandle: () => ({ name: "project-directory" }),
+      } as any,
+    })
+  );

src/setupTests.ts

@@ -20,5 +20,3 @@ window.preload = api;
 // Dexie expects window.indexedDB to be defined which isn't available in the Jest environment
 Dexie.dependencies.indexedDB = fakeIndexedDB;
 Dexie.dependencies.IDBKeyRange = FDBKeyRange;
-
-// window.