@jsonforms/material-renderers 3.0.0-beta.1 → 3.0.0-beta.4

package/test/renderers/MaterialObjectControl.test.tsx

@@ -68,14 +68,14 @@ const uischema2: ControlElement = {
 
 describe('Material object renderer tester', () => {
   test('should fail', () => {
-    expect(materialObjectControlTester(undefined, undefined)).toBe(
+    expect(materialObjectControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialObjectControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialObjectControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialObjectControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialObjectControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialObjectControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialObjectControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
@@ -84,7 +84,8 @@ describe('Material object renderer tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialObjectControlTester(uischema2, {
@@ -93,7 +94,8 @@ describe('Material object renderer tester', () => {
           foo: { type: 'string' },
           bar: schema.properties.bar
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -104,7 +106,8 @@ describe('Material object renderer tester', () => {
         properties: {
           foo: schema.properties.foo
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialOneOfEnumCell.test.tsx

@@ -70,7 +70,8 @@ describe('Material one of enum cell tester', () => {
         properties: {
           country: schema
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialOneOfRadioGroupControl.test.tsx

@@ -63,7 +63,7 @@ const uischema: ControlElement = {
 
 describe('Material oneof radio group tester', () => {
   it('should return valid rank for oneof enums with radio format', () => {
-    const rank = materialOneOfRadioGroupControlTester(uischema, oneOfSchema);
+    const rank = materialOneOfRadioGroupControlTester(uischema, oneOfSchema, undefined);
     expect(rank).not.toBe(NOT_APPLICABLE);
   });
 
@@ -74,7 +74,8 @@ describe('Material oneof radio group tester', () => {
     };
     const rank = materialOneOfRadioGroupControlTester(
       uiSchemaNoRadio,
-      oneOfSchema
+      oneOfSchema,
+      undefined
     );
     expect(rank).toBe(NOT_APPLICABLE);
   });

package/test/renderers/MaterialOneOfRenderer.test.tsx

@@ -309,7 +309,7 @@ describe('Material oneOf renderer', () => {
     }, 1000);
   });
 
-  it.skip('should add an item within an array', async () => {
+  it('should add an item within an array', async () => {
     const schema = {
       type: 'object',
       properties: {
@@ -366,7 +366,7 @@ describe('Material oneOf renderer', () => {
     expect(nrOfRowsAfterAdd.length).toBe(3);
   });
 
-  it.skip('should add an object within an array', async () => {
+  it('should add an object within an array', async () => {
     const schema = {
       type: 'object',
       properties: {
@@ -424,7 +424,6 @@ describe('Material oneOf renderer', () => {
 
     await waitForAsync();
 
-    // expect(wrapper.state())
     wrapper.update();
 
     selectOneOfTab(wrapper, 1, false);
@@ -441,7 +440,7 @@ describe('Material oneOf renderer', () => {
     });
   });
 
-  it.skip('should switch to array based oneOf subschema, then switch back, then edit', async () => {
+  it('should switch to array based oneOf subschema, then switch back, then edit', async (done) => {
     const schema = {
       type: 'object',
       properties: {
@@ -511,9 +510,15 @@ describe('Material oneOf renderer', () => {
     const input = wrapper.find('input').first();
     input.simulate('change', { target: { value: 'test' } });
     wrapper.update();
-    expect(onChangeData.data).toEqual({
-      thingOrThings: { thing: 'test' }
-    });
+
+    setTimeout(() => {
+      expect(onChangeData.data).toEqual({
+        thingOrThings: { thing: 'test' }
+      });
+      done();
+    }, 1000);
+
+    
   });
 
   it('should show confirm dialog when data is not an empty object', async () => {

package/test/renderers/MaterialRadioGroupControl.test.tsx

@@ -56,7 +56,7 @@ const uischema: ControlElement = {
 
 describe('Material radio group tester', () => {
   it('should return valid rank for enums with radio format', () => {
-    const rank = materialRadioGroupControlTester(uischema, schema);
+    const rank = materialRadioGroupControlTester(uischema, schema, undefined);
     expect(rank).not.toBe(NOT_APPLICABLE);
   });
 
@@ -65,7 +65,7 @@ describe('Material radio group tester', () => {
       type: 'Control',
       scope: '#/properties/foo'
     };
-    const rank = materialRadioGroupControlTester(uiSchemaNoRadio, schema);
+    const rank = materialRadioGroupControlTester(uiSchemaNoRadio, schema, undefined);
     expect(rank).toBe(NOT_APPLICABLE);
   });
 });

package/test/renderers/MaterialSliderControl.test.tsx

@@ -64,14 +64,14 @@ const uischema: ControlElement = {
 
 describe('Material slider tester', () => {
   it('should fail', () => {
-    expect(materialSliderControlTester(undefined, undefined)).toBe(
+    expect(materialSliderControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialSliderControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialSliderControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialSliderControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialSliderControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialSliderControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialSliderControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
   });
@@ -83,7 +83,8 @@ describe('Material slider tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -95,7 +96,8 @@ describe('Material slider tester', () => {
           foo: { type: 'string' },
           bar: { type: 'number' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -106,7 +108,8 @@ describe('Material slider tester', () => {
         properties: {
           foo: { type: 'number' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -120,7 +123,8 @@ describe('Material slider tester', () => {
             minimum: 2
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -134,7 +138,8 @@ describe('Material slider tester', () => {
             maximum: 10
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -149,7 +154,8 @@ describe('Material slider tester', () => {
             minimum: 2
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -165,7 +171,8 @@ describe('Material slider tester', () => {
             default: 6
           }
         }
-      })
+      },
+      undefined)
     ).toBe(4);
   });
 
@@ -181,7 +188,8 @@ describe('Material slider tester', () => {
             default: 6
           }
         }
-      })
+      },
+      undefined)
     ).toBe(4);
   });
 });

package/test/renderers/MaterialTextCell.test.tsx

@@ -62,12 +62,12 @@ const uischema: ControlElement = {
 
 describe('Material text cell tester', () => {
   it('should fail', () => {
-    expect(materialTextCellTester(undefined, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialTextCellTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialTextCellTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialTextCellTester(undefined, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialTextCellTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialTextCellTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialTextCellTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialTextCellTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
   });
@@ -84,7 +84,8 @@ describe('Material text cell tester', () => {
             type: 'number'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -104,7 +105,8 @@ describe('Material text cell tester', () => {
             type: 'string'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -121,7 +123,8 @@ describe('Material text cell tester', () => {
             type: 'string'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(1);
   });
 });

package/test/renderers/MaterialTimeCell.test.tsx

@@ -54,12 +54,12 @@ const uischema: ControlElement = {
 
 describe('Material time cell tester', () => {
   it('should fail', () => {
-    expect(materialTimeCellTester(undefined, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialTimeCellTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialTimeCellTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialTimeCellTester(undefined, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialTimeCellTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialTimeCellTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialTimeCellTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialTimeCellTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
   });
@@ -71,7 +71,8 @@ describe('Material time cell tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -86,7 +87,8 @@ describe('Material time cell tester', () => {
             format: 'time'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -100,7 +102,8 @@ describe('Material time cell tester', () => {
             format: 'time'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(2);
   });
 });

package/test/renderers/MaterialTimeControl.test.tsx

@@ -57,14 +57,14 @@ const uischema: ControlElement = {
 
 describe('Material time control tester', () => {
   test('should fail', () => {
-    expect(materialTimeControlTester(undefined, undefined)).toBe(
+    expect(materialTimeControlTester(undefined, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialTimeControlTester(null, undefined)).toBe(NOT_APPLICABLE);
-    expect(materialTimeControlTester({ type: 'Foo' }, undefined)).toBe(
+    expect(materialTimeControlTester(null, undefined, undefined)).toBe(NOT_APPLICABLE);
+    expect(materialTimeControlTester({ type: 'Foo' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
-    expect(materialTimeControlTester({ type: 'Control' }, undefined)).toBe(
+    expect(materialTimeControlTester({ type: 'Control' }, undefined, undefined)).toBe(
       NOT_APPLICABLE
     );
     expect(
@@ -73,7 +73,8 @@ describe('Material time control tester', () => {
         properties: {
           foo: { type: 'string' }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
     expect(
       materialTimeControlTester(uischema, {
@@ -85,7 +86,8 @@ describe('Material time control tester', () => {
             format: 'time'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(NOT_APPLICABLE);
   });
 
@@ -99,7 +101,8 @@ describe('Material time control tester', () => {
             format: 'time'
           }
         }
-      })
+      },
+      undefined)
     ).toBe(4);
     expect(
       materialTimeControlTester(
@@ -111,7 +114,8 @@ describe('Material time control tester', () => {
               type: 'string'
             }
           }
-        }
+        },
+        undefined
       )
     ).toBe(4);
   });