all tests

demo/package.json

@@ -25,7 +25,6 @@
         "@babel/preset-react": "^7.23.3",
         "@babel/preset-typescript": "^7.23.3",
         "@testing-library/react": "^14.2.1",
-        "@testing-library/user-event": "^14.5.2",
         "@types/react": "^18.2.45",
         "@types/react-dom": "^18.2.18",
         "babel-jest": "^29.7.0",

demo/src/MemoryModels.tsx

@@ -40,7 +40,6 @@ function MemoryModelsFileInput(props: MemoryModelsInputPropTypes) {
     };
 
     const onReapplyBtnClick = () => {
-        console.log("reached");
         props.setTextData(uploadedFileString);
     };
 

demo/src/__tests__/MemoryModels.spec.tsx

@@ -95,11 +95,9 @@ describe("MemoryModelsUserInput", () => {
 
         it("calls console error and setTextData when file upload fails", async () => {
             const mockErrorMessage = "Mock error message";
-            const fileReaderSpy = jest
-                .spyOn(global, "FileReader")
-                .mockImplementationOnce(() => {
-                    throw new Error(mockErrorMessage);
-                });
+            jest.spyOn(global, "FileReader").mockImplementationOnce(() => {
+                throw new Error(mockErrorMessage);
+            });
             const consoleErrorSpy = jest.spyOn(console, "error");
 
             const file = new File(
@@ -110,67 +108,55 @@ describe("MemoryModelsUserInput", () => {
                 }
             );
             const input: HTMLInputElement = screen.getByTestId("file-input");
-            fireEvent.change(input, { target: { files: [file] } });
             await waitFor(() => {
-                expect(consoleErrorSpy).toHaveBeenNthCalledWith(
-                    1,
-                    `Error parsing uploaded File as JSON: ${mockErrorMessage}`
-                );
-                expect(setTextDataMock).toHaveBeenNthCalledWith(1, null);
+                // this needs to be awaited because of fileReader.onload being async
+                fireEvent.change(input, { target: { files: [file] } });
             });
+
+            expect(consoleErrorSpy).toHaveBeenNthCalledWith(
+                1,
+                `Error parsing uploaded File as JSON: ${mockErrorMessage}`
+            );
+            expect(setTextDataMock).toHaveBeenNthCalledWith(1, null);
         });
 
         describe("when a file is uploaded", () => {
             const fileString = JSON.stringify({ id: 1, uuid: 2 });
             let input: HTMLInputElement;
 
-            beforeEach(() => {
+            beforeEach(async () => {
                 const file = new File([fileString], "test.json", {
                     type: "application/json",
                 });
                 input = screen.getByTestId("file-input");
                 fireEvent.change(input, { target: { files: [file] } });
             });
 
-            it("calls setTextData", async () => {
-                await waitFor(() => {
-                    expect(setTextDataMock).toHaveBeenNthCalledWith(
-                        1,
-                        fileString
-                    );
-                });
-            });
-
-            it("enabled reapply Button", () => {
+            it("enables reapply Button", async () => {
                 const reapplyBtn = screen.getByTestId(
                     "file-input-reapply-button"
                 );
-                expect(reapplyBtn).toHaveProperty("disabled", true);
+                await waitFor(() => {
+                    expect(reapplyBtn).toHaveProperty("disabled", false);
+                });
             });
 
             it("clicking reapply button calls setTextData", async () => {
                 const reapplyBtn = screen.getByTestId(
                     "file-input-reapply-button"
                 );
-                fireEvent.click(reapplyBtn);
 
                 await waitFor(() => {
-                    // reapply original fileString
+                    // wait until the button is enabled to click
+                    expect(reapplyBtn).toHaveProperty("disabled", false);
+                    fireEvent.click(reapplyBtn);
+                    // once from reapplyBtn onChange, once from MemoryModelsTextInput handleTextFieldChange
                     expect(setTextDataMock).toHaveBeenNthCalledWith(
-                        1,
+                        2,
                         fileString
                     );
                 });
             });
-
-            it("clicking reapply button doesn't call setTextData if there hasn't been a text change", async () => {
-                const reapplyBtn = screen.getByTestId(
-                    "file-input-reapply-button"
-                );
-                fireEvent.click(reapplyBtn);
-
-                expect(setTextDataMock).toHaveBeenNthCalledWith(1, fileString);
-            });
         });
     });
 });