test improvements

erikras · erikras · commit 104b18ed68d3 · 2025-06-09T08:20:28.000+02:00
diff --git a/src/Field.test.js b/src/Field.test.js
@@ -1237,22 +1237,15 @@ describe("Field", () => {
   });
 
   it("should throw an error if name prop is undefined", () => {
-    jest.spyOn(console, "error").mockImplementation(() => {});
-
-    const errorSpy = jest.fn();
-    render(
-      <ErrorBoundary spy={errorSpy}>
+    const consoleError = console.error;
+    console.error = jest.fn(); // Suppress React error boundary warning
+    expect(() => {
+      render(
         <Form onSubmit={onSubmitMock}>
           {() => <Field name={undefined} render={() => <input />} />}
-        </Form>
-      </ErrorBoundary>,
-    );
-
-    expect(errorSpy).toHaveBeenCalled();
-    expect(errorSpy).toHaveBeenCalledTimes(1);
-    expect(errorSpy.mock.calls[0][0].message).toBe(
-      "prop name cannot be undefined in <Field> component",
-    );
-    console.error.mockRestore();
+        </Form>,
+      );
+    }).toThrow("prop name cannot be undefined in <Field> component");
+    console.error = consoleError;
   });
 });
diff --git a/src/context.test.js b/src/context.test.js
@@ -0,0 +1,43 @@
+import * as React from "react";
+import { render } from "@testing-library/react";
+import FormContext from "./context";
+import ReactFinalForm from "./ReactFinalForm";
+
+describe("FormContext", () => {
+  it("should provide form context to children", () => {
+    const spy = jest.fn();
+    const TestComponent = () => {
+      const form = React.useContext(FormContext);
+      spy(form);
+      return null;
+    };
+
+    render(
+      <ReactFinalForm onSubmit={() => {}}>
+        {({ form }) => (
+          <FormContext.Provider value={form}>
+            <TestComponent />
+          </FormContext.Provider>
+        )}
+      </ReactFinalForm>,
+    );
+
+    expect(spy).toHaveBeenCalledTimes(1);
+    expect(spy.mock.calls[0][0]).toBeDefined();
+    expect(typeof spy.mock.calls[0][0].registerField).toBe("function");
+  });
+
+  it("should have undefined as default value", () => {
+    const spy = jest.fn();
+    const TestComponent = () => {
+      const form = React.useContext(FormContext);
+      spy(form);
+      return null;
+    };
+
+    render(<TestComponent />);
+
+    expect(spy).toHaveBeenCalledTimes(1);
+    expect(spy.mock.calls[0][0]).toBeUndefined();
+  });
+});
diff --git a/src/useField.test.js b/src/useField.test.js
@@ -457,4 +457,55 @@ describe("useField", () => {
     expect(spy.mock.calls[3][1]).toBe(spy.mock.calls[2][1]); // onFocus
     expect(spy.mock.calls[3][2]).toBe(spy.mock.calls[2][2]); // onBlur
   });
+
+  it("should handle null values correctly with allowNull", () => {
+    const spy = jest.fn();
+    const MyField = ({ name }) => {
+      const { input } = useField(name, {
+        subscription: { value: true },
+        allowNull: true,
+      });
+      spy(input.value);
+      // Convert null to empty string for the input element to avoid React warnings
+      return (
+        <input {...input} value={input.value === null ? "" : input.value} />
+      );
+    };
+    const { rerender } = render(
+      <Form onSubmit={onSubmitMock} initialValues={{ myField: null }}>
+        {() => (
+          <form>
+            <MyField name="myField" />
+          </form>
+        )}
+      </Form>,
+    );
+
+    // Change to non-null value
+    rerender(
+      <Form onSubmit={onSubmitMock} initialValues={{ myField: "test" }}>
+        {() => (
+          <form>
+            <MyField name="myField" />
+          </form>
+        )}
+      </Form>,
+    );
+
+    // Change back to null
+    rerender(
+      <Form onSubmit={onSubmitMock} initialValues={{ myField: null }}>
+        {() => (
+          <form>
+            <MyField name="myField" />
+          </form>
+        )}
+      </Form>,
+    );
+
+    const calls = spy.mock.calls.map((call) => call[0]);
+    expect(calls).toContain(null); // At least one call with null
+    expect(calls).toContain("test"); // At least one call with 'test'
+    expect(calls[calls.length - 1]).toBe(null); // Last call is null
+  });
 });
