Skip to content

Commit c806a4f

Browse files
SkaiirSkaiir
committed
chore: fix field instance tests
Related to #1147
1 parent 8776056 commit c806a4f

14 files changed

+77
-145
lines changed

‎packages/form-js-viewer/test/spec/Form.spec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ describe('Form', function () {
11791179

11801180
// update programmatically
11811181
form._update({
1182-
field,
1182+
fieldInstance: { id: field.id, valuePath: ['creditor'] },
11831183
value: 'Jane Doe Company',
11841184
});
11851185

@@ -1209,17 +1209,17 @@ describe('Form', function () {
12091209

12101210
// update programmatically
12111211
form._update({
1212-
field: getFormField(form, 'creditor'),
1212+
fieldInstance: { id: getFormField(form, 'creditor').id, valuePath: ['creditor'] },
12131213
value: 'Jane Doe Company',
12141214
});
12151215

12161216
form._update({
1217-
field: getFormField(form, 'amount'),
1217+
fieldInstance: { id: getFormField(form, 'amount').id, valuePath: ['amount'] },
12181218
value: '123',
12191219
});
12201220

12211221
form._update({
1222-
field: getFormField(form, 'approved'),
1222+
fieldInstance: { id: getFormField(form, 'approved').id, valuePath: ['approved'] },
12231223
value: true,
12241224
});
12251225

@@ -1291,7 +1291,7 @@ describe('Form', function () {
12911291
const field = getFormField(form, 'creditor');
12921292

12931293
form._update({
1294-
field,
1294+
fieldInstance: { id: field.id, valuePath: ['creditor'] },
12951295
value: 'Jane Doe Company',
12961296
});
12971297

‎packages/form-js-viewer/test/spec/render/components/FormField.spec.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { FormField } from 'src/render/components/FormField';
66

77
import { Textfield } from 'src/render/components/form-fields/Textfield';
88

9-
import { UpdateFieldValidationHandler } from 'src/features/viewerCommands/cmd/UpdateFieldValidationHandler';
9+
import { UpdateFieldInstanceValidationHandler } from 'src/features/viewerCommands/cmd/UpdateFieldInstanceValidationHandler';
1010

1111
import { MockFormContext } from './helper';
1212

@@ -518,10 +518,10 @@ function createFormField(options = {}) {
518518
};
519519

520520
const validatorMock = {
521-
validateField: (field, value) => validationErrors,
521+
validateFieldInstance: (fieldInstance, value) => validationErrors,
522522
};
523523

524-
const updateFieldValidationHandler = new UpdateFieldValidationHandler(formMock, validatorMock);
524+
const updateFieldInstanceValidationHandler = new UpdateFieldInstanceValidationHandler(formMock, validatorMock);
525525

526526
const conditionCheckerMock =
527527
checkCondition !== false
@@ -567,8 +567,8 @@ function createFormField(options = {}) {
567567
templating: templatingMock,
568568
validator: validatorMock,
569569
viewerCommands: {
570-
updateFieldValidation(field, value) {
571-
return updateFieldValidationHandler.execute({ field, value });
570+
updateFieldInstanceValidation(fieldInstance, value) {
571+
return updateFieldInstanceValidationHandler.execute({ fieldInstance, value });
572572
},
573573
},
574574
pathRegistry: {

‎packages/form-js-viewer/test/spec/render/components/form-fields/Checkbox.spec.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,7 @@ describe('Checkbox', function () {
144144
fireEvent.change(input, { target: { checked: false } });
145145

146146
// then
147-
expect(onChangeSpy).to.have.been.calledWith({
148-
field: defaultField,
147+
expect(onChangeSpy).to.have.been.calledWithMatch({
149148
value: false,
150149
});
151150
});

‎packages/form-js-viewer/test/spec/render/components/form-fields/Checklist.spec.js

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ describe('Checklist', function () {
248248
fireEvent.click(input);
249249

250250
// then
251-
expect(onChangeSpy).to.have.been.calledWith({
252-
field: defaultField,
251+
expect(onChangeSpy).to.have.been.calledWithMatch({
253252
value: ['approver', 'manager'],
254253
});
255254
});
@@ -269,8 +268,7 @@ describe('Checklist', function () {
269268
fireEvent.click(input, { target: { checked: false } });
270269

271270
// then
272-
expect(onChangeSpy).to.have.been.calledWith({
273-
field: defaultField,
271+
expect(onChangeSpy).to.have.been.calledWithMatch({
274272
value: [],
275273
});
276274
});
@@ -294,8 +292,7 @@ describe('Checklist', function () {
294292
fireEvent.click(input);
295293

296294
// then
297-
expect(onChangeSpy).to.have.been.calledWith({
298-
field: dynamicField,
295+
expect(onChangeSpy).to.have.been.calledWithMatch({
299296
value: ['dynamicValue1', 'dynamicValue2'],
300297
});
301298
});
@@ -317,8 +314,7 @@ describe('Checklist', function () {
317314
fireEvent.click(input);
318315

319316
// then
320-
expect(onChangeSpy).to.have.been.calledWith({
321-
field: dynamicField,
317+
expect(onChangeSpy).to.have.been.calledWithMatch({
322318
value: ['dynamicValue1', 'dynamicValue2'],
323319
});
324320
});
@@ -346,8 +342,7 @@ describe('Checklist', function () {
346342
fireEvent.click(input);
347343

348344
// then
349-
expect(onChangeSpy).to.have.been.calledWith({
350-
field: dynamicField,
345+
expect(onChangeSpy).to.have.been.calledWithMatch({
351346
value: [
352347
{
353348
id: 'user3',
@@ -380,8 +375,7 @@ describe('Checklist', function () {
380375
fireEvent.click(input, { target: { checked: false } });
381376

382377
// then
383-
expect(onChangeSpy).to.have.been.calledWith({
384-
field: dynamicField,
378+
expect(onChangeSpy).to.have.been.calledWithMatch({
385379
value: [],
386380
});
387381
});
@@ -409,8 +403,7 @@ describe('Checklist', function () {
409403
fireEvent.click(input, { target: { checked: false } });
410404

411405
// then
412-
expect(onChangeSpy).to.have.been.calledWith({
413-
field: dynamicField,
406+
expect(onChangeSpy).to.have.been.calledWithMatch({
414407
value: [],
415408
});
416409
});

‎packages/form-js-viewer/test/spec/render/components/form-fields/Datetime.spec.js

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ describe('Datetime', function () {
129129
fireEvent.blur(dateInput);
130130

131131
// then
132-
expect(onChangeSpy).to.have.been.calledWith({
133-
field: dateField,
132+
expect(onChangeSpy).to.have.been.calledWithMatch({
134133
value: '2000-01-01',
135134
});
136135
});
@@ -152,8 +151,7 @@ describe('Datetime', function () {
152151
fireEvent.click(firstDayNode);
153152

154153
// then
155-
expect(onChangeSpy).to.have.been.calledWith({
156-
field: dateField,
154+
expect(onChangeSpy).to.have.been.calledWithMatch({
157155
value: '1996-10-27',
158156
});
159157
});
@@ -174,8 +172,7 @@ describe('Datetime', function () {
174172
fireEvent.blur(dateInput);
175173

176174
// then
177-
expect(onChangeSpy).to.have.been.calledWith({
178-
field: dateField,
175+
expect(onChangeSpy).to.have.been.calledWithMatch({
179176
value: null,
180177
});
181178
});
@@ -202,8 +199,7 @@ describe('Datetime', function () {
202199
fireEvent.click(firstDayNode);
203200

204201
// then
205-
expect(onChangeSpy).to.have.been.calledWith({
206-
field: dateField,
202+
expect(onChangeSpy).to.have.been.calledWithMatch({
207203
value: '1996-12-01',
208204
});
209205
});
@@ -228,8 +224,7 @@ describe('Datetime', function () {
228224
fireEvent.click(firstDayNode);
229225

230226
// then
231-
expect(onChangeSpy).to.have.been.calledWith({
232-
field: dateField,
227+
expect(onChangeSpy).to.have.been.calledWithMatch({
233228
value: '1996-09-29',
234229
});
235230
});
@@ -254,8 +249,7 @@ describe('Datetime', function () {
254249
fireEvent.click(firstDayNode);
255250

256251
// then
257-
expect(onChangeSpy).to.have.been.calledWith({
258-
field: dateField,
252+
expect(onChangeSpy).to.have.been.calledWithMatch({
259253
value: '1995-12-31',
260254
});
261255
});
@@ -582,8 +576,7 @@ describe('Datetime', function () {
582576
fireEvent.blur(dateInput);
583577

584578
// then
585-
expect(onChangeSpy).to.have.been.calledWith({
586-
field: timeField,
579+
expect(onChangeSpy).to.have.been.calledWithMatch({
587580
value: '13:00',
588581
});
589582
});
@@ -605,8 +598,7 @@ describe('Datetime', function () {
605598
fireEvent.blur(dateInput);
606599

607600
// then
608-
expect(onChangeSpy).to.have.been.calledWith({
609-
field: timeField,
601+
expect(onChangeSpy).to.have.been.calledWithMatch({
610602
value: '13:00',
611603
});
612604
});
@@ -628,8 +620,7 @@ describe('Datetime', function () {
628620
fireEvent.blur(dateInput);
629621

630622
// then
631-
expect(onChangeSpy).to.have.been.calledWith({
632-
field: timeField,
623+
expect(onChangeSpy).to.have.been.calledWithMatch({
633624
value: null,
634625
});
635626
});
@@ -818,8 +809,7 @@ describe('Datetime', function () {
818809
fireEvent.blur(dateInput);
819810

820811
// then
821-
expect(onChangeSpy).to.have.been.calledWith({
822-
field: datetimeField,
812+
expect(onChangeSpy).to.have.been.calledWithMatch({
823813
value: '2000-01-01T11:00',
824814
});
825815
});
@@ -841,8 +831,7 @@ describe('Datetime', function () {
841831
fireEvent.blur(timeInput);
842832

843833
// then
844-
expect(onChangeSpy).to.have.been.calledWith({
845-
field: { ...datetimeField, use24h: true },
834+
expect(onChangeSpy).to.have.been.calledWithMatch({
846835
value: '1996-11-13T12:00',
847836
});
848837
});
@@ -864,8 +853,7 @@ describe('Datetime', function () {
864853
fireEvent.blur(dateInput);
865854

866855
// then
867-
expect(onChangeSpy).to.have.been.calledWith({
868-
field: datetimeField,
856+
expect(onChangeSpy).to.have.been.calledWithMatch({
869857
value: null,
870858
});
871859
});
@@ -887,8 +875,7 @@ describe('Datetime', function () {
887875
fireEvent.blur(dateInput);
888876

889877
// then
890-
expect(onChangeSpy).to.have.been.calledWith({
891-
field: datetimeField,
878+
expect(onChangeSpy).to.have.been.calledWithMatch({
892879
value: null,
893880
});
894881
});

‎packages/form-js-viewer/test/spec/render/components/form-fields/Dynamiclist.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ describe('Dynamic List', () => {
137137

138138
// then
139139
expect(onChangeSpy).to.have.been.calledWithMatch({
140-
field,
141140
value: [
142141
{
143142
creditor: 'John Doe',

0 commit comments

Comments
 (0)