Skip to content

Commit 85ec74c

Browse files
jamesgpearcejamesgpearce
committed
[tests] Remove unneeded awaits
1 parent 2832e45 commit 85ec74c

File tree

1 file changed

+41
-50
lines changed

1 file changed

+41
-50
lines changed

‎test/unit/mergeables/synchronizers.test.ts‎

Lines changed: 41 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ describe.each([
180180
]);
181181
await synchronizer1.save();
182182
await pause(synchronizable.pauseMilliseconds, true);
183-
await expectEachToHaveContent(
183+
expectEachToHaveContent(
184184
[
185185
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
186186
{v1: 1, v2: 2},
@@ -196,7 +196,7 @@ describe.each([
196196
{v1: 1, v2: 2},
197197
]);
198198
await pause(synchronizable.pauseMilliseconds, true);
199-
await expectEachToHaveContent(
199+
expectEachToHaveContent(
200200
[
201201
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
202202
{v1: 1, v2: 2},
@@ -212,7 +212,7 @@ describe.each([
212212
]);
213213
await synchronizer1.load([{t0: {r0: {c0: 0}}}, {v0: 0}]);
214214
await pause(synchronizable.pauseMilliseconds, true);
215-
await expectEachToHaveContent(
215+
expectEachToHaveContent(
216216
[{t0: {r0: {c0: 0}}}, {v0: 0}],
217217
[
218218
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
@@ -228,7 +228,7 @@ describe.each([
228228
{v1: 1, v2: 2},
229229
]);
230230
await pause(synchronizable.pauseMilliseconds, true);
231-
await expectEachToHaveContent(
231+
expectEachToHaveContent(
232232
[{t0: {r0: {c0: 0}}}, {v0: 0}],
233233
[
234234
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
@@ -325,7 +325,7 @@ describe.each([
325325
// ---
326326

327327
test('Both empty', async () => {
328-
await expectEachToHaveContent([{}, {}]);
328+
expectEachToHaveContent([{}, {}]);
329329
});
330330

331331
test('Both match', async () => {
@@ -338,7 +338,7 @@ describe.each([
338338
{v1: 1, v2: 2},
339339
]);
340340
await pause(synchronizable.pauseMilliseconds, true);
341-
await expectEachToHaveContent([
341+
expectEachToHaveContent([
342342
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
343343
{v1: 1, v2: 2},
344344
]);
@@ -355,7 +355,7 @@ describe.each([
355355
{v1: 1, v2: 2},
356356
]);
357357
await pause(synchronizable.pauseMilliseconds, true);
358-
await expectEachToHaveContent([
358+
expectEachToHaveContent([
359359
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
360360
{v1: 1, v2: 2},
361361
]);
@@ -367,7 +367,7 @@ describe.each([
367367
{v1: 1, v2: 2},
368368
]);
369369
await pause(synchronizable.pauseMilliseconds, true);
370-
await expectEachToHaveContent([
370+
expectEachToHaveContent([
371371
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
372372
{v1: 1, v2: 2},
373373
]);
@@ -379,7 +379,7 @@ describe.each([
379379
{v1: 1, v2: 2},
380380
]);
381381
await pause(synchronizable.pauseMilliseconds, true);
382-
await expectEachToHaveContent([
382+
expectEachToHaveContent([
383383
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
384384
{v1: 1, v2: 2},
385385
]);
@@ -393,7 +393,7 @@ describe.each([
393393
{v1: 1, v2: 2},
394394
]);
395395
await pause(synchronizable.pauseMilliseconds, true);
396-
await expectEachToHaveContent([
396+
expectEachToHaveContent([
397397
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
398398
{v1: 1, v2: 2},
399399
]);
@@ -407,7 +407,7 @@ describe.each([
407407
{v1: 1, v2: 2},
408408
]);
409409
await pause(synchronizable.pauseMilliseconds, true);
410-
await expectEachToHaveContent([
410+
expectEachToHaveContent([
411411
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
412412
{v1: 1, v2: 2},
413413
]);
@@ -418,7 +418,7 @@ describe.each([
418418
await pause(synchronizable.pauseMilliseconds, true);
419419
store2.setTable('t2', {r2: {c2: 2}});
420420
await pause(synchronizable.pauseMilliseconds, true);
421-
await expectEachToHaveContent([
421+
expectEachToHaveContent([
422422
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
423423
{},
424424
]);
@@ -432,7 +432,7 @@ describe.each([
432432
t2: {r2: {c2: 2}},
433433
});
434434
await pause(synchronizable.pauseMilliseconds, true);
435-
await expectEachToHaveContent([
435+
expectEachToHaveContent([
436436
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
437437
{},
438438
]);
@@ -446,7 +446,7 @@ describe.each([
446446
t2: {r2: {c2: 2}},
447447
});
448448
await pause(synchronizable.pauseMilliseconds, true);
449-
await expectEachToHaveContent([
449+
expectEachToHaveContent([
450450
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
451451
{},
452452
]);
@@ -457,64 +457,55 @@ describe.each([
457457
await pause(synchronizable.pauseMilliseconds, true);
458458
store2.setRow('t1', 'r2', {c2: 2});
459459
await pause(synchronizable.pauseMilliseconds, true);
460-
await expectEachToHaveContent([
461-
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}},
462-
{},
463-
]);
460+
expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}}, {}]);
464461
});
465462

466463
test('store1 missing row', async () => {
467464
store1.setRow('t1', 'r1', {c1: 1, c2: 2});
468465
await pause(synchronizable.pauseMilliseconds, true);
469466
store2.setTable('t1', {r1: {c1: 1, c2: 2}, r2: {c2: 2}});
470467
await pause(synchronizable.pauseMilliseconds, true);
471-
await expectEachToHaveContent([
472-
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}},
473-
{},
474-
]);
468+
expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}}, {}]);
475469
});
476470

477471
test('store2 missing row', async () => {
478472
store2.setRow('t1', 'r1', {c1: 1, c2: 2});
479473
await pause(synchronizable.pauseMilliseconds, true);
480474
store1.setTable('t1', {r1: {c1: 1, c2: 2}, r2: {c2: 2}});
481475
await pause(synchronizable.pauseMilliseconds, true);
482-
await expectEachToHaveContent([
483-
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}},
484-
{},
485-
]);
476+
expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}}, {}]);
486477
});
487478

488479
test('different row', async () => {
489480
store1.setCell('t1', 'r1', 'c1', 1);
490481
await pause(synchronizable.pauseMilliseconds, true);
491482
store2.setCell('t1', 'r1', 'c2', 2);
492483
await pause(synchronizable.pauseMilliseconds, true);
493-
await expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}}}, {}]);
484+
expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}}}, {}]);
494485
});
495486

496487
test('store1 missing cell', async () => {
497488
store1.setCell('t1', 'r1', 'c1', 1);
498489
await pause(synchronizable.pauseMilliseconds, true);
499490
store2.setRow('t1', 'r1', {c1: 1, c2: 2});
500491
await pause(synchronizable.pauseMilliseconds, true);
501-
await expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}}}, {}]);
492+
expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}}}, {}]);
502493
});
503494

504495
test('store2 missing cell', async () => {
505496
store2.setCell('t1', 'r1', 'c1', 1);
506497
await pause(synchronizable.pauseMilliseconds, true);
507498
store1.setRow('t1', 'r1', {c1: 1, c2: 2});
508499
await pause(synchronizable.pauseMilliseconds, true);
509-
await expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}}}, {}]);
500+
expectEachToHaveContent([{t1: {r1: {c1: 1, c2: 2}}}, {}]);
510501
});
511502

512503
test('different cell', async () => {
513504
store1.setCell('t1', 'r1', 'c1', 1);
514505
await pause(synchronizable.pauseMilliseconds, true);
515506
store2.setCell('t1', 'r1', 'c1', 2);
516507
await pause(synchronizable.pauseMilliseconds, true);
517-
await expectEachToHaveContent([{t1: {r1: {c1: 2}}}, {}]);
508+
expectEachToHaveContent([{t1: {r1: {c1: 2}}}, {}]);
518509
});
519510

520511
test('deleted tables', async () => {
@@ -525,7 +516,7 @@ describe.each([
525516
await pause(synchronizable.pauseMilliseconds, true);
526517
store2.delTables();
527518
await pause(synchronizable.pauseMilliseconds, true);
528-
await expectEachToHaveContent([{}, {v1: 1, v2: 2}]);
519+
expectEachToHaveContent([{}, {v1: 1, v2: 2}]);
529520
});
530521

531522
test('deleted table', async () => {
@@ -536,7 +527,7 @@ describe.each([
536527
await pause(synchronizable.pauseMilliseconds, true);
537528
store2.delTable('t2');
538529
await pause(synchronizable.pauseMilliseconds, true);
539-
await expectEachToHaveContent([
530+
expectEachToHaveContent([
540531
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}},
541532
{v1: 1, v2: 2},
542533
]);
@@ -550,7 +541,7 @@ describe.each([
550541
await pause(synchronizable.pauseMilliseconds, true);
551542
store2.delRow('t1', 'r2');
552543
await pause(synchronizable.pauseMilliseconds, true);
553-
await expectEachToHaveContent([
544+
expectEachToHaveContent([
554545
{t1: {r1: {c1: 1, c2: 2}}, t2: {r2: {c2: 2}}},
555546
{v1: 1, v2: 2},
556547
]);
@@ -564,7 +555,7 @@ describe.each([
564555
await pause(synchronizable.pauseMilliseconds, true);
565556
store2.delCell('t1', 'r1', 'c2');
566557
await pause(synchronizable.pauseMilliseconds, true);
567-
await expectEachToHaveContent([
558+
expectEachToHaveContent([
568559
{t1: {r1: {c1: 1}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
569560
{v1: 1, v2: 2},
570561
]);
@@ -578,7 +569,7 @@ describe.each([
578569
await pause(synchronizable.pauseMilliseconds, true);
579570
store2.delValues();
580571
await pause(synchronizable.pauseMilliseconds, true);
581-
await expectEachToHaveContent([
572+
expectEachToHaveContent([
582573
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
583574
{},
584575
]);
@@ -592,7 +583,7 @@ describe.each([
592583
await pause(synchronizable.pauseMilliseconds, true);
593584
store2.delValue('v2');
594585
await pause(synchronizable.pauseMilliseconds, true);
595-
await expectEachToHaveContent([
586+
expectEachToHaveContent([
596587
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
597588
{v1: 1},
598589
]);
@@ -609,7 +600,7 @@ describe.each([
609600
{v1: 1, v2: 2},
610601
]);
611602
await pause(synchronizable.pauseMilliseconds, true);
612-
await expectEachToHaveContent([
603+
expectEachToHaveContent([
613604
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
614605
{v1: 1, v2: 2},
615606
]);
@@ -626,7 +617,7 @@ describe.each([
626617
{v1: 1, v2: 2},
627618
]);
628619
await pause(synchronizable.pauseMilliseconds, true);
629-
await expectEachToHaveContent([
620+
expectEachToHaveContent([
630621
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
631622
{v1: 1, v2: 2},
632623
]);
@@ -637,31 +628,31 @@ describe.each([
637628
await pause(synchronizable.pauseMilliseconds, true);
638629
store2.setValue('v2', 2);
639630
await pause(synchronizable.pauseMilliseconds, true);
640-
await expectEachToHaveContent([{}, {v1: 1, v2: 2}]);
631+
expectEachToHaveContent([{}, {v1: 1, v2: 2}]);
641632
});
642633

643634
test('store1 missing value', async () => {
644635
store1.setValue('v2', 2);
645636
await pause(synchronizable.pauseMilliseconds, true);
646637
store2.setValues({v1: 1, v2: 2});
647638
await pause(synchronizable.pauseMilliseconds, true);
648-
await expectEachToHaveContent([{}, {v1: 1, v2: 2}]);
639+
expectEachToHaveContent([{}, {v1: 1, v2: 2}]);
649640
});
650641

651642
test('store2 missing value', async () => {
652643
store2.setValue('v2', 2);
653644
await pause(synchronizable.pauseMilliseconds, true);
654645
store1.setValues({v1: 1, v2: 2});
655646
await pause(synchronizable.pauseMilliseconds, true);
656-
await expectEachToHaveContent([{}, {v1: 1, v2: 2}]);
647+
expectEachToHaveContent([{}, {v1: 1, v2: 2}]);
657648
});
658649

659650
test('different value', async () => {
660651
store1.setValue('v1', 1);
661652
await pause(synchronizable.pauseMilliseconds, true);
662653
store2.setValue('v1', 2);
663654
await pause(synchronizable.pauseMilliseconds, true);
664-
await expectEachToHaveContent([{}, {v1: 2}]);
655+
expectEachToHaveContent([{}, {v1: 2}]);
665656
});
666657

667658
describe('tracking messages', () => {
@@ -671,12 +662,12 @@ describe.each([
671662
store1.setTables({t1: {r1: {c1: 1}}});
672663
await pause(synchronizable.pauseMilliseconds, true);
673664
expect(environment[1]).toMatchSnapshot();
674-
await expectEachToHaveContent([{t1: {r1: {c1: 1}}}, {}]);
665+
expectEachToHaveContent([{t1: {r1: {c1: 1}}}, {}]);
675666

676667
environment[1].clear();
677668
store1.setTables({t1: {r1: {c1: 1}}, t2: {r2: {c2: 2}}});
678669
await pause(synchronizable.pauseMilliseconds, true);
679-
await expectEachToHaveContent([
670+
expectEachToHaveContent([
680671
{t1: {r1: {c1: 1}}, t2: {r2: {c2: 2}}},
681672
{},
682673
]);
@@ -688,7 +679,7 @@ describe.each([
688679
t2: {r2: {c2: 2}},
689680
});
690681
await pause(synchronizable.pauseMilliseconds, true);
691-
await expectEachToHaveContent([
682+
expectEachToHaveContent([
692683
{t1: {r1: {c1: 1}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
693684
{},
694685
]);
@@ -700,7 +691,7 @@ describe.each([
700691
t2: {r2: {c2: 2}},
701692
});
702693
await pause(synchronizable.pauseMilliseconds, true);
703-
await expectEachToHaveContent([
694+
expectEachToHaveContent([
704695
{t1: {r1: {c1: 1, c2: 2}, r2: {c2: 2}}, t2: {r2: {c2: 2}}},
705696
{},
706697
]);
@@ -713,7 +704,7 @@ describe.each([
713704
t3: {r3: {c3: 3}},
714705
});
715706
await pause(synchronizable.pauseMilliseconds, true);
716-
await expectEachToHaveContent([
707+
expectEachToHaveContent([
717708
{
718709
t1: {r1: {c1: 1, c2: 2, c3: 3}, r2: {c2: 2}, r3: {c3: 3}},
719710
t2: {r2: {c2: 2}},
@@ -731,7 +722,7 @@ describe.each([
731722
store1.setValue('v1', 1);
732723
await pause(synchronizable.pauseMilliseconds, true);
733724
expect(environment[1]).toMatchSnapshot();
734-
await expectEachToHaveContent([{}, {v1: 1}]);
725+
expectEachToHaveContent([{}, {v1: 1}]);
735726
}
736727
});
737728

@@ -744,7 +735,7 @@ describe.each([
744735
store1.setCell('t1', 'r1', 'c1', 2);
745736
await pause(synchronizable.pauseMilliseconds, true);
746737
expect(environment[1]).toMatchSnapshot();
747-
await expectEachToHaveContent([{t1: {r1: {c1: 2, c2: 2}}}, {}]);
738+
expectEachToHaveContent([{t1: {r1: {c1: 2, c2: 2}}}, {}]);
748739
}
749740
});
750741

@@ -757,7 +748,7 @@ describe.each([
757748
store1.setValue('v1', 2);
758749
await pause(synchronizable.pauseMilliseconds, true);
759750
expect(environment[1]).toMatchSnapshot();
760-
await expectEachToHaveContent([{}, {v1: 2, v2: 2}]);
751+
expectEachToHaveContent([{}, {v1: 2, v2: 2}]);
761752
}
762753
});
763754
});

0 commit comments

Comments
 (0)