test(reactive-rpc): 💍 use client.* in blocks.* tests

Author: streamich

src/server/__tests__/blocks.spec.ts

@@ -7,9 +7,9 @@ import {tick, until} from '../../__tests__/util';
 describe('blocks.*', () => {
   describe('blocks.create', () => {
     test('can create an empty block', async () => {
-      const {caller} = setup();
-      await caller.call('blocks.create', {id: 'my-block', patches: []}, {});
-      const {block} = (await caller.call('blocks.get', {id: 'my-block'}, {})).data;
+      const {call} = setup();
+      await call('blocks.create', {id: 'my-block', patches: []});
+      const {block} = (await call('blocks.get', {id: 'my-block'}));
       expect(block).toMatchObject({
         id: 'my-block',
         seq: -1,
@@ -283,48 +283,48 @@ describe('blocks.*', () => {
 
   describe('blocks.listen', () => {
     test('can listen for block changes', async () => {
-      const {call, caller} = setup();
-      await call('blocks.create', {id: 'my-block', patches: []});
+      const {client} = setup();
+      await client.call('blocks.create', {id: 'my-block', patches: []});
       await tick(11);
       const emits: any[] = [];
-      caller.call$('blocks.listen', of({id: 'my-block'}), {}).subscribe((data) => emits.push(data));
+      client.call$('blocks.listen', of({id: 'my-block'})).subscribe((data) => emits.push(data));
       const model = Model.withLogicalClock();
       model.api.root({
         text: 'Hell',
       });
       const patch1 = model.api.flush();
       await tick(12);
       expect(emits.length).toBe(0);
-      await call('blocks.edit', {id: 'my-block', patches: [{seq: 0, created: Date.now(), blob: patch1.toBinary()}]});
+      await client.call('blocks.edit', {id: 'my-block', patches: [{seq: 0, created: Date.now(), blob: patch1.toBinary()}]});
       await until(() => emits.length === 1);
       expect(emits.length).toBe(1);
-      expect(emits[0].data.patches.length).toBe(1);
-      expect(emits[0].data.patches[0].seq).toBe(0);
+      expect(emits[0].patches.length).toBe(1);
+      expect(emits[0].patches[0].seq).toBe(0);
       model.api.root({
         text: 'Hello',
       });
       const patch2 = model.api.flush();
       await tick(12);
       expect(emits.length).toBe(1);
-      await call('blocks.edit', {id: 'my-block', patches: [{seq: 1, created: Date.now(), blob: patch2.toBinary()}]});
+      await client.call('blocks.edit', {id: 'my-block', patches: [{seq: 1, created: Date.now(), blob: patch2.toBinary()}]});
       await until(() => emits.length === 2);
       expect(emits.length).toBe(2);
-      expect(emits[1].data.patches.length).toBe(1);
-      expect(emits[1].data.patches[0].seq).toBe(1);
+      expect(emits[1].patches.length).toBe(1);
+      expect(emits[1].patches[0].seq).toBe(1);
     });
 
     test('can subscribe before block is created', async () => {
-      const {call, caller} = setup();
+      const {client} = setup();
       const emits: any[] = [];
-      caller.call$('blocks.listen', of({id: 'my-block'}), {}).subscribe((data) => emits.push(data));
+      client.call$('blocks.listen', of({id: 'my-block'})).subscribe((data) => emits.push(data));
       const model = Model.withLogicalClock();
       model.api.root({
         text: 'Hell',
       });
       const patch1 = model.api.flush();
       await tick(12);
       expect(emits.length).toBe(0);
-      await call('blocks.create', {
+      await client.call('blocks.create', {
         id: 'my-block',
         patches: [
           {
@@ -336,21 +336,22 @@ describe('blocks.*', () => {
       });
       await until(() => emits.length === 1);
       expect(emits.length).toBe(1);
-      expect(emits[0].data.patches.length).toBe(1);
-      expect(emits[0].data.patches[0].seq).toBe(0);
-      expect(emits[0].data.patches[0].blob).toStrictEqual(patch1.toBinary());
+      expect(emits[0].patches.length).toBe(1);
+      expect(emits[0].patches[0].seq).toBe(0);
+      expect(emits[0].patches[0].blob).toStrictEqual(patch1.toBinary());
     });
 
     test('can receive deletion events', async () => {
-      const {call, caller} = setup();
+      const {client} = setup();
       const emits: any[] = [];
-      caller.call$('blocks.listen', of({id: 'my-block'}), {}).subscribe((data) => emits.push(data));
-      await call('blocks.create', {id: 'my-block', patches: []});
+      client.call$('blocks.listen', of({id: 'my-block'})).subscribe((data) => emits.push(data));
+      await client.call('blocks.create', {id: 'my-block', patches: []});
       await until(() => emits.length === 1);
-      expect(emits[0].data.block.seq).toBe(-1);
-      await call('blocks.remove', {id: 'my-block'});
+      expect(emits[0].block.seq).toBe(-1);
+      await tick(3);
+      await client.call('blocks.remove', {id: 'my-block'});
       await until(() => emits.length === 2);
-      expect(emits[1].data.deleted).toBe(true);
+      expect(emits[1].deleted).toBe(true);
     });
   });
 

src/server/__tests__/setup.ts

@@ -5,7 +5,6 @@ import {Services} from '../services/Services';
 export const setup = () => {
   const services = new Services();
   const {caller} = createCaller(services);
-  const call = caller.callSimple.bind(caller);
   const {client} = buildE2eClient(caller, {
     writerDefaultBufferKb: [1, 32],
     clientBufferSize: [1, 3],
@@ -15,5 +14,7 @@ export const setup = () => {
     requestLatency: [1, 10],
     responseLatency: [1, 10],
   });
-  return {services, caller, call, client};
+  const call = client.call.bind(client);
+  const call$ = client.call$.bind(client);
+  return {services, caller, client, call, call$};
 };