Skip to content

Commit 75d1a34

Browse files
InitialValue -> DefaultValue @ tests.
DefaultValue added while registering field @ tests.
1 parent 78fad76 commit 75d1a34

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

packages/simplr-forms-core/__tests__/stores/form-store.test.ts

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,24 @@ describe("Form store", () => {
3232
const formId = "FORM-ID";
3333
const fieldId = "FIELD-ID";
3434
const initialValue = "INITIAL-VALUE";
35+
const defaultValue = "DEFAULT-VALUE";
3536
const formStore = new FormStore(formId);
3637

37-
formStore.RegisterField(fieldId, initialValue);
38+
formStore.RegisterField(fieldId, initialValue, defaultValue);
3839
expect(formStore.HasField(fieldId)).toBe(true);
3940
expect(formStore.GetField(fieldId)).not.toBeUndefined();
40-
expect(formStore.GetField(fieldId).InitialValue).toBe(initialValue);
41+
expect(formStore.GetField(fieldId).Value).toBe(initialValue);
42+
expect(formStore.GetField(fieldId).DefaultValue).toBe(defaultValue);
4143
});
4244

4345
it("unregisters a field", () => {
4446
const formId = "FORM-ID";
4547
const fieldId = "FIELD-ID";
4648
const initialValue = "INITIAL-VALUE";
49+
const defaultValue = "DEFAULT-VALUE";
4750
const formStore = new FormStore(formId);
4851

49-
formStore.RegisterField(fieldId, initialValue);
52+
formStore.RegisterField(fieldId, initialValue, defaultValue);
5053
formStore.UnregisterField(fieldId);
5154
expect(formStore.GetField(fieldId)).toBeUndefined();
5255
expect(formStore.HasField(fieldId)).toBe(false);
@@ -56,32 +59,35 @@ describe("Form store", () => {
5659
const formId = "FORM-ID";
5760
const fieldId = "FIELD-ID";
5861
const initialValue = "INITIAL-VALUE";
62+
const defaultValue = "DEFAULT-VALUE";
5963
const formStore = new FormStore(formId);
6064

6165
expect(formStore.HasField(fieldId)).toBe(false);
62-
formStore.RegisterField(fieldId, initialValue);
66+
formStore.RegisterField(fieldId, initialValue, defaultValue);
6367
expect(formStore.HasField(fieldId)).toBe(true);
6468
});
6569

6670
it("get a field", () => {
6771
const formId = "FORM-ID";
6872
const fieldId = "FIELD-ID";
6973
const initialValue = "INITIAL-VALUE";
74+
const defaultValue = "DEFAULT-VALUE";
7075
const formStore = new FormStore(formId);
7176

7277
expect(formStore.GetField(fieldId)).toBeUndefined();
73-
formStore.RegisterField(fieldId, initialValue);
78+
formStore.RegisterField(fieldId, initialValue, defaultValue);
7479
expect(formStore.GetField(fieldId)).not.toBeUndefined();
7580
});
7681

7782
it("value changed", () => {
7883
const formId = "FORM-ID";
7984
const fieldId = "FIELD-ID";
8085
const initialValue = "INITIAL-VALUE";
86+
const defaultValue = "DEFAULT-VALUE";
8187
const nextValue = "NEXT-VALUE";
8288
const formStore = new FormStore(formId);
8389

84-
formStore.RegisterField(fieldId, initialValue);
90+
formStore.RegisterField(fieldId, initialValue, defaultValue);
8591
expect(formStore.GetField(fieldId).Value).toBe(initialValue);
8692
formStore.ValueChanged(fieldId, nextValue);
8793
expect(formStore.GetField(fieldId).Value).toBe(nextValue);
@@ -91,9 +97,10 @@ describe("Form store", () => {
9197
const formId = "FORM-ID";
9298
const fieldId = "FIELD-ID";
9399
const initialValue = "INITIAL-VALUE";
100+
const defaultValue = "DEFAULT-VALUE";
94101
const formStore = new FormStore(formId);
95102

96-
formStore.RegisterField(fieldId, initialValue);
103+
formStore.RegisterField(fieldId, initialValue, defaultValue);
97104
const validationPromise = new Promise<void>((resolve, reject) => {
98105
setTimeout(() => {
99106
resolve();
@@ -120,10 +127,11 @@ describe("Form store", () => {
120127
const formId = "FORM-ID";
121128
const fieldId = "FIELD-ID";
122129
const initialValue = "INITIAL-VALUE";
130+
const defaultValue = "DEFAULT-VALUE";
123131
const formStore = new FormStore(formId);
124132
const formError: FormError = { Message: "Error Message" };
125133

126-
formStore.RegisterField(fieldId, initialValue);
134+
formStore.RegisterField(fieldId, initialValue, defaultValue);
127135
const validationPromise = new Promise<void>((resolve, reject) => {
128136
setTimeout(() => {
129137
reject(formError);
@@ -161,10 +169,11 @@ describe("Form store", () => {
161169
const formId = "FORM-ID";
162170
const fieldId = "FIELD-ID";
163171
const initialValue = "INITIAL-VALUE";
172+
const defaultValue = "DEFAULT-VALUE";
164173
const formStore = new FormStore(formId);
165174
const formError = "field error";
166175

167-
formStore.RegisterField(fieldId, initialValue);
176+
formStore.RegisterField(fieldId, initialValue, defaultValue);
168177
const validationPromise = new Promise<void>((resolve, reject) => {
169178
setTimeout(() => {
170179
reject(formError);
@@ -203,14 +212,16 @@ describe("Form store", () => {
203212
it("registers field with props", () => {
204213
const formId = "FORM-ID";
205214
const fieldId = "FIELD-ID";
215+
const defaultValue = "DEFAULT-VALUE";
206216
const fieldProps: MyFieldProps = {
207217
name: "fieldName",
208218
value: "initial-value",
219+
defaultValue: defaultValue,
209220
randomKey: "random value"
210221
};
211222
const formStore = new FormStore(formId);
212223

213-
formStore.RegisterField(fieldId, fieldProps.value, fieldProps);
224+
formStore.RegisterField(fieldId, fieldProps.value, fieldProps.defaultValue, fieldProps);
214225

215226
const fieldPropsRecord = recordify<FieldStateProps, FieldStatePropsRecord>(fieldProps);
216227

@@ -221,9 +232,11 @@ describe("Form store", () => {
221232
it("updates field props", () => {
222233
const formId = "FORM-ID";
223234
const fieldId = "FIELD-ID";
235+
const defaultValue = "DEFAULT-VALUE";
224236
const fieldProps: MyFieldProps = {
225237
name: "field-name",
226238
value: "initialValue",
239+
defaultValue: defaultValue,
227240
randomKey: "random value"
228241
};
229242

@@ -235,7 +248,7 @@ describe("Form store", () => {
235248
const fieldPropsNextRecord = recordify<FieldStateProps, FieldStatePropsRecord>(fieldPropsNext);
236249
const formStore = new FormStore(formId);
237250

238-
formStore.RegisterField(fieldId, fieldProps.value, fieldProps);
251+
formStore.RegisterField(fieldId, fieldProps.value, fieldProps.defaultValue, fieldProps);
239252
formStore.UpdateProps(fieldId, fieldPropsNext);
240253

241254
// Deep-check the updated props

packages/simplr-forms-core/__tests__/test-components/test-field.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { FieldProps, FieldValue } from "../../src/contracts/field";
55

66
export interface MyFieldProps extends FieldProps {
77
value?: string;
8+
defaultValue?: string;
89
randomKey?: string;
910
}
1011

0 commit comments

Comments
 (0)