Skip to content

Commit fd637ff

Browse files
davimacedodavimacedo
authored
Required fields and default values (#5835)
* Add field options to mongo schema metadata * Add/fix test with fields options * Add required validation failing test * Add more tests * Only set default value if field is undefined * Fix redis test * Fix tests * Test for creating a new class with field options * Validate default value type * fix lint (weird) * Fix lint another way * Add tests for beforeSave trigger and solve small issue regarding the use of unset in the beforeSave trigger
1 parent d3810c2 commit fd637ff

File tree

8 files changed

+606
-40
lines changed

8 files changed

+606
-40
lines changed

‎spec/RedisCacheAdapter.spec.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ describe_only(() => {
188188
const object = new TestObject();
189189
object.set('foo', 'bar');
190190
await object.save();
191-
expect(getSpy.calls.count()).toBe(2);
191+
expect(getSpy.calls.count()).toBe(3);
192192
expect(putSpy.calls.count()).toBe(2);
193193
});
194194

@@ -201,7 +201,7 @@ describe_only(() => {
201201
booleanField: true,
202202
});
203203
await container.save();
204-
expect(getSpy.calls.count()).toBe(2);
204+
expect(getSpy.calls.count()).toBe(3);
205205
expect(putSpy.calls.count()).toBe(2);
206206
});
207207

@@ -215,7 +215,7 @@ describe_only(() => {
215215

216216
object.set('foo', 'barz');
217217
await object.save();
218-
expect(getSpy.calls.count()).toBe(2);
218+
expect(getSpy.calls.count()).toBe(3);
219219
expect(putSpy.calls.count()).toBe(0);
220220
});
221221

@@ -233,7 +233,7 @@ describe_only(() => {
233233
objects.push(object);
234234
}
235235
await Parse.Object.saveAll(objects);
236-
expect(getSpy.calls.count()).toBe(11);
236+
expect(getSpy.calls.count()).toBe(21);
237237
expect(putSpy.calls.count()).toBe(10);
238238

239239
getSpy.calls.reset();
@@ -258,7 +258,7 @@ describe_only(() => {
258258
objects.push(object);
259259
}
260260
await Parse.Object.saveAll(objects, { batchSize: 5 });
261-
expect(getSpy.calls.count()).toBe(12);
261+
expect(getSpy.calls.count()).toBe(22);
262262
expect(putSpy.calls.count()).toBe(5);
263263

264264
getSpy.calls.reset();
@@ -279,7 +279,7 @@ describe_only(() => {
279279

280280
object.set('new', 'barz');
281281
await object.save();
282-
expect(getSpy.calls.count()).toBe(2);
282+
expect(getSpy.calls.count()).toBe(3);
283283
expect(putSpy.calls.count()).toBe(1);
284284
});
285285

@@ -299,7 +299,7 @@ describe_only(() => {
299299
booleanField: true,
300300
});
301301
await object.save();
302-
expect(getSpy.calls.count()).toBe(2);
302+
expect(getSpy.calls.count()).toBe(3);
303303
expect(putSpy.calls.count()).toBe(1);
304304
});
305305

@@ -309,7 +309,7 @@ describe_only(() => {
309309
user.setPassword('testing');
310310
await user.signUp();
311311

312-
expect(getSpy.calls.count()).toBe(6);
312+
expect(getSpy.calls.count()).toBe(8);
313313
expect(putSpy.calls.count()).toBe(1);
314314
});
315315

@@ -326,7 +326,7 @@ describe_only(() => {
326326

327327
object.set('foo', 'bar');
328328
await object.save();
329-
expect(getSpy.calls.count()).toBe(3);
329+
expect(getSpy.calls.count()).toBe(4);
330330
expect(putSpy.calls.count()).toBe(1);
331331

332332
getSpy.calls.reset();

‎spec/Schema.spec.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ describe('SchemaController', () => {
504504
schema
505505
.addClassIfNotExists('_InvalidName', { foo: { type: 'String' } })
506506
.catch(error => {
507-
expect(error.error).toEqual(
507+
expect(error.message).toEqual(
508508
'Invalid classname: _InvalidName, classnames can only have alphanumeric characters and _, and must start with an alpha character '
509509
);
510510
done();
@@ -522,7 +522,7 @@ describe('SchemaController', () => {
522522
)
523523
.catch(error => {
524524
expect(error.code).toEqual(Parse.Error.INVALID_KEY_NAME);
525-
expect(error.error).toEqual('invalid field name: 0InvalidName');
525+
expect(error.message).toEqual('invalid field name: 0InvalidName');
526526
done();
527527
});
528528
});
@@ -535,7 +535,7 @@ describe('SchemaController', () => {
535535
)
536536
.catch(error => {
537537
expect(error.code).toEqual(136);
538-
expect(error.error).toEqual('field objectId cannot be added');
538+
expect(error.message).toEqual('field objectId cannot be added');
539539
done();
540540
});
541541
});
@@ -550,7 +550,7 @@ describe('SchemaController', () => {
550550
)
551551
.catch(error => {
552552
expect(error.code).toEqual(136);
553-
expect(error.error).toEqual('field localeIdentifier cannot be added');
553+
expect(error.message).toEqual('field localeIdentifier cannot be added');
554554
done();
555555
});
556556
});
@@ -565,7 +565,7 @@ describe('SchemaController', () => {
565565
)
566566
.catch(error => {
567567
expect(error.code).toEqual(Parse.Error.INVALID_JSON);
568-
expect(error.error).toEqual('invalid JSON');
568+
expect(error.message).toEqual('invalid JSON');
569569
done();
570570
});
571571
});
@@ -580,7 +580,7 @@ describe('SchemaController', () => {
580580
)
581581
.catch(error => {
582582
expect(error.code).toEqual(135);
583-
expect(error.error).toEqual('type Pointer needs a class name');
583+
expect(error.message).toEqual('type Pointer needs a class name');
584584
done();
585585
});
586586
});
@@ -595,7 +595,7 @@ describe('SchemaController', () => {
595595
)
596596
.catch(error => {
597597
expect(error.code).toEqual(Parse.Error.INVALID_JSON);
598-
expect(error.error).toEqual('invalid JSON');
598+
expect(error.message).toEqual('invalid JSON');
599599
done();
600600
});
601601
});
@@ -610,7 +610,7 @@ describe('SchemaController', () => {
610610
)
611611
.catch(error => {
612612
expect(error.code).toEqual(135);
613-
expect(error.error).toEqual('type Relation needs a class name');
613+
expect(error.message).toEqual('type Relation needs a class name');
614614
done();
615615
});
616616
});
@@ -625,7 +625,7 @@ describe('SchemaController', () => {
625625
)
626626
.catch(error => {
627627
expect(error.code).toEqual(Parse.Error.INVALID_JSON);
628-
expect(error.error).toEqual('invalid JSON');
628+
expect(error.message).toEqual('invalid JSON');
629629
done();
630630
});
631631
});
@@ -640,7 +640,7 @@ describe('SchemaController', () => {
640640
)
641641
.catch(error => {
642642
expect(error.code).toEqual(Parse.Error.INVALID_CLASS_NAME);
643-
expect(error.error).toEqual(
643+
expect(error.message).toEqual(
644644
'Invalid classname: not a valid class name, classnames can only have alphanumeric characters and _, and must start with an alpha character '
645645
);
646646
done();
@@ -657,7 +657,7 @@ describe('SchemaController', () => {
657657
)
658658
.catch(error => {
659659
expect(error.code).toEqual(Parse.Error.INVALID_CLASS_NAME);
660-
expect(error.error).toEqual(
660+
expect(error.message).toEqual(
661661
'Invalid classname: not a valid class name, classnames can only have alphanumeric characters and _, and must start with an alpha character '
662662
);
663663
done();
@@ -674,7 +674,7 @@ describe('SchemaController', () => {
674674
)
675675
.catch(error => {
676676
expect(error.code).toEqual(Parse.Error.INCORRECT_TYPE);
677-
expect(error.error).toEqual('invalid field type: Unknown');
677+
expect(error.message).toEqual('invalid field type: Unknown');
678678
done();
679679
});
680680
});
@@ -929,7 +929,7 @@ describe('SchemaController', () => {
929929
)
930930
.catch(error => {
931931
expect(error.code).toEqual(Parse.Error.INCORRECT_TYPE);
932-
expect(error.error).toEqual(
932+
expect(error.message).toEqual(
933933
'currently, only one GeoPoint field may exist in an object. Adding geo2 when geo1 already exists.'
934934
);
935935
done();

0 commit comments

Comments
 (0)