rename parameter and adapt tests

Author: sdirix

packages/react/src/JsonFormsContext.tsx

@@ -132,15 +132,12 @@ export interface Middleware {
   (
     state: JsonFormsCore,
     action: CoreActions,
-    defaultDispatch: (
-      state: JsonFormsCore,
-      action: CoreActions
-    ) => JsonFormsCore
+    defaultReducer: (state: JsonFormsCore, action: CoreActions) => JsonFormsCore
   ): JsonFormsCore;
 }
 
-const defaultMiddleware: Middleware = (state, action, defaultDispatch) =>
-  defaultDispatch(state, action);
+const defaultMiddleware: Middleware = (state, action, defaultReducer) =>
+  defaultReducer(state, action);
 
 export const JsonFormsStateProvider = ({
   children,

packages/react/test/renderers/JsonForms.test.tsx

@@ -1102,7 +1102,7 @@ test('JsonForms should use react to additionalErrors update', () => {
   wrapper.unmount();
 });
 
-test('JsonForms middleware should be called if provided', () => {
+test('JsonForms middleware should be called if provided', async () => {
   // given
   const onChangeHandler = jest.fn();
   const customMiddleware = jest.fn();
@@ -1136,31 +1136,39 @@ test('JsonForms middleware should be called if provided', () => {
       renderers={renderers}
     />
   );
-  setTimeout(() => {
-    const calls = onChangeHandler.mock.calls;
-    const lastCallParameter = calls[calls.length - 1][0];
-    expect(lastCallParameter.data).toEqual({ foo: 'John Doe' });
-    expect(lastCallParameter.errors).toEqual([]);
-  }, 50);
 
-  // when
+  // wait for 50 ms for the change handler invocation
+  await new Promise((resolve) => setTimeout(resolve, 50));
+
+  // initial rendering should call onChange 1 time
+  expect(onChangeHandler).toHaveBeenCalledTimes(1);
+  const calls = onChangeHandler.mock.calls;
+  const lastCallParameter = calls[calls.length - 1][0];
+  expect(lastCallParameter.data).toEqual({ foo: 'John Doe' });
+  expect(lastCallParameter.errors).toEqual([]);
+
+  // adapt test input
   wrapper.find('input').simulate('change', {
     target: {
       value: 'Test Value',
     },
   });
 
-  // then
   expect(customMiddleware).toHaveBeenCalledTimes(1);
-  expect(onChangeHandler).not.toHaveBeenCalled();
+
+  // wait for 50 ms for the change handler invocation
+  await new Promise((resolve) => setTimeout(resolve, 50));
+  // change handler should not have been called another time as we blocked the update in the middleware
+  expect(onChangeHandler).toHaveBeenCalledTimes(1);
+  // The rendered field should also not have been updated
   expect(wrapper.find('input').getDOMNode<HTMLInputElement>().value).toBe(
     'John Doe'
   );
 
   wrapper.unmount();
 });
 
-test('JsonForms middleware should update state if modified', () => {
+test('JsonForms middleware should update state if modified', async () => {
   // given
   const onChangeHandler = jest.fn();
   const customMiddleware = jest.fn();
@@ -1195,14 +1203,20 @@ test('JsonForms middleware should update state if modified', () => {
       renderers={renderers}
     />
   );
-  setTimeout(() => {
+
+  // wait for 50 ms for the change handler invocation
+  await new Promise((resolve) => setTimeout(resolve, 50));
+
+  // initial rendering should call onChange 1 time
+  expect(onChangeHandler).toHaveBeenCalledTimes(1);
+  {
     const calls = onChangeHandler.mock.calls;
     const lastCallParameter = calls[calls.length - 1][0];
     expect(lastCallParameter.data).toEqual({ foo: 'John Doe' });
     expect(lastCallParameter.errors).toEqual([]);
-  }, 50);
+  }
 
-  // when
+  // adapt input
   wrapper.find('input').simulate('change', {
     target: {
       value: 'Test Value',
@@ -1214,12 +1228,17 @@ test('JsonForms middleware should update state if modified', () => {
   expect(wrapper.find('input').getDOMNode<HTMLInputElement>().value).toBe(
     'Test Value Test'
   );
-  setTimeout(() => {
+
+  // wait for 50 ms for the change handler invocation
+  await new Promise((resolve) => setTimeout(resolve, 50));
+  // onChangeHandler should have been called after the state update
+  expect(onChangeHandler).toHaveBeenCalledTimes(2);
+  {
     const calls = onChangeHandler.mock.calls;
-    const lastCallParameter = calls[calls.length - 1][1];
+    const lastCallParameter = calls[calls.length - 1][0];
     expect(lastCallParameter.data).toEqual({ foo: 'Test Value Test' });
     expect(lastCallParameter.errors).toEqual([]);
-  }, 50);
+  }
 
   wrapper.unmount();
 });