Update tests following re-org

Author: jamiefdhurst

src/__tests__/inbox.test.ts

@@ -1,4 +1,4 @@
-import { TFile, TFolder, Vault } from 'obsidian';
+import { FileManager, TFile, TFolder, Vault } from 'obsidian';
 import { INBOX_FOLDER } from '..';
 import { Inbox } from '../inbox';
 
@@ -7,14 +7,16 @@ describe('Inbox', () => {
   let sut: Inbox;
 
   let vault: Vault;
+  let fileManager: FileManager;
 
   beforeEach(() => {
     vault = jest.fn() as unknown as Vault;
     vault.getAllFolders = jest.fn();
     vault.getFolderByPath = jest.fn();
-    vault.rename = jest.fn();
+    fileManager = jest.fn() as unknown as FileManager;
+    fileManager.renameFile = jest.fn();
 
-    sut = new Inbox(vault);
+    sut = new Inbox(vault, fileManager);
   });
 
   it('returns empty when the inbox folder is not found', () => {
@@ -70,13 +72,13 @@ describe('Inbox', () => {
   });
 
   it('moves a file', async () => {
-    const vaultRename = jest.spyOn(vault, 'rename');
+    const fileManagerRename = jest.spyOn(fileManager, 'renameFile');
 
     const file = new TFile();
     file.name = 'example.md';
 
     await sut.move(file, 'some/new/path');
 
-    expect(vaultRename).toHaveBeenCalledWith(file, 'some/new/path/example.md');
+    expect(fileManagerRename).toHaveBeenCalledWith(file, 'some/new/path/example.md');
   });
 });

src/__tests__/modal.test.ts src/__tests__/modal/index.test.tssrc/__tests__/modal.test.ts renamed to src/__tests__/modal/index.test.ts

@@ -1,6 +1,6 @@
 import { App, TFile, TFolder } from 'obsidian';
-import { Inbox } from '../inbox';
-import { CLS_PREFIX, OrganiserModal } from '../modal';
+import { Inbox } from '../../inbox';
+import { CLS_PREFIX, OrganiserModal } from '../../modal';
 
 const WAIT_TIME: number = 20;
 
@@ -55,8 +55,7 @@ describe('OrganiserModal', () => {
     await sut.onOpen();
 
     const select = sut.contentEl.find(`.${CLS_PREFIX}top .${CLS_PREFIX}dropdown`);
-    expect(select).toBeInstanceOf(HTMLSelectElement);
-    expect(select.children.length).toEqual(1);
+    expect(select).toBeInstanceOf(HTMLInputElement);
 
     const table = sut.contentEl.find(`.${CLS_PREFIX}files table`);
     expect(table).toBeInstanceOf(HTMLTableElement);
@@ -70,11 +69,7 @@ describe('OrganiserModal', () => {
     await sut.onOpen();
 
     const selectEl = sut.contentEl.find(`.${CLS_PREFIX}top .${CLS_PREFIX}dropdown`);
-    expect(selectEl).toBeInstanceOf(HTMLSelectElement);
-    expect(selectEl.children.length).toEqual(4);
-    expect(selectEl.children[1].innerHTML).toEqual('Level One');
-    expect(selectEl.children[2].innerHTML).toEqual('Level Two (Level One)');
-    expect(selectEl.children[3].innerHTML).toEqual('Level Three (Level One > Level Two)');
+    expect(selectEl).toBeInstanceOf(HTMLInputElement);
 
     const tableEl = sut.contentEl.find(`.${CLS_PREFIX}files table`);
     expect(tableEl).toBeInstanceOf(HTMLTableElement);