From bbe2deed81c71cff9ab16f7599d9802f97fb3478 Mon Sep 17 00:00:00 2001
From: Camden Phalen <cphalen@hubspot.com>
Date: Fri, 5 Jan 2024 15:27:07 -0500
Subject: [PATCH] fix tests + types

---
 api/fileManager.ts           | 4 ++--
 lib/__tests__/fileManager.ts | 4 ++--
 lib/fileManager.ts           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/fileManager.ts b/api/fileManager.ts
index bb00356e..4dc124ce 100644
--- a/api/fileManager.ts
+++ b/api/fileManager.ts
@@ -51,7 +51,7 @@ export async function fetchStat(
 
 export async function fetchFiles(
   accountId: number,
-  folderId: number,
+  folderId: number | 'None',
   offset: number,
   archived?: boolean
 ): Promise<FetchFilesResponse> {
@@ -68,7 +68,7 @@ export async function fetchFiles(
 
 export async function fetchFolders(
   accountId: number,
-  folderId: number
+  folderId: number | 'None'
 ): Promise<FetchFolderResponse> {
   return http.get(accountId, {
     url: `${FILE_MANAGER_V2_API_PATH}/folders/`,
diff --git a/lib/__tests__/fileManager.ts b/lib/__tests__/fileManager.ts
index a2571e17..badd704c 100644
--- a/lib/__tests__/fileManager.ts
+++ b/lib/__tests__/fileManager.ts
@@ -3,8 +3,8 @@ import { uploadFile } from '../../api/fileManager';
 import { walk } from '../fs';
 import { createIgnoreFilter } from '../ignoreRules';
 
-jest.mock('../lib/walk');
-jest.mock('../api/fileManager');
+jest.mock('../fs');
+jest.mock('../../api/fileManager');
 jest.mock('../ignoreRules');
 
 describe('uploadFolder', () => {
diff --git a/lib/fileManager.ts b/lib/fileManager.ts
index 9acfa4d5..14fe4679 100644
--- a/lib/fileManager.ts
+++ b/lib/fileManager.ts
@@ -129,7 +129,7 @@ async function downloadFile(
 
 async function fetchAllPagedFiles(
   accountId: number,
-  folderId: number,
+  folderId: number | 'None',
   includeArchived?: boolean
 ): Promise<Array<File>> {
   let totalFiles: number | null = null;