test: 💍 make unit tests pass after refactor

Author: streamich

src/__demos__/json-crdt-server/__tests__/block.spec.ts

@@ -1,4 +1,5 @@
 import {setup} from './setup';
 import {runBlockTests} from '../../../__tests__/json-crdt-server/block';
+import type {ApiTestSetup} from '../../../common/rpc/__tests__/runApiTests';
 
-runBlockTests(setup);
+runBlockTests(setup as ApiTestSetup);

src/__demos__/json-crdt-server/__tests__/presence.spec.ts

@@ -1,4 +1,5 @@
 import {runPresenceTests} from '../../../__tests__/json-crdt-server/presence';
 import {setup} from './setup';
+import type {ApiTestSetup} from '../../../common/rpc/__tests__/runApiTests';
 
-runPresenceTests(setup);
+runPresenceTests(setup as ApiTestSetup);

src/__demos__/json-crdt-server/__tests__/pubsub.spec.ts

@@ -1,4 +1,5 @@
 import {runPubsubTests} from '../../../__tests__/json-crdt-server/pubsub';
 import {setup} from './setup';
+import type {ApiTestSetup} from '../../../common/rpc/__tests__/runApiTests';
 
-runPubsubTests(setup);
+runPubsubTests(setup as ApiTestSetup);

src/__demos__/json-crdt-server/__tests__/util.spec.ts

@@ -1,4 +1,5 @@
 import {runUtilTests} from '../../../__tests__/json-crdt-server/util';
 import {setup} from './setup';
+import type {ApiTestSetup} from '../../../common/rpc/__tests__/runApiTests';
 
-runUtilTests(setup);
+runUtilTests(setup as ApiTestSetup);

src/common/rpc/__tests__/RpcDuplex.spec.ts

@@ -55,8 +55,30 @@ const setup = () => {
   return {server, client};
 };
 
-const setup1: ApiTestSetup = () => ({client: setup().client});
-const setup2: ApiTestSetup = () => ({client: setup().server});
+const setup1: ApiTestSetup = () => {
+  const client = setup().client;
+  const call = client.call.bind(client);
+  const call$ = client.call$.bind(client);
+  const stop = client.stop.bind(client);
+  return {
+    call,
+    call$,
+    stop,
+    client: {call, call$, stop},
+  };
+};
+const setup2: ApiTestSetup = () => {
+  const client = setup().server;
+  const call = client.call.bind(client);
+  const call$ = client.call$.bind(client);
+  const stop = client.stop.bind(client);
+  return {
+    call,
+    call$,
+    stop,
+    client: {call, call$, stop},
+  };
+};
 
 describe('duplex 1', () => {
   runApiTests(setup1);

src/common/rpc/__tests__/RpcMessageStreamProcessorLocalClient-api.spec.ts

@@ -24,4 +24,15 @@ const setup = () => {
   };
 };
 
-runApiTests(() => ({client: setup().client}));
+runApiTests(() => {
+  const client = setup().client;
+  const call = client.call.bind(client);
+  const call$ = client.call$.bind(client);
+  const stop = client.stop.bind(client);
+  return {
+    call,
+    call$,
+    stop,
+    client: {call, call$, stop},
+  };
+});

src/common/rpc/__tests__/api.spec.ts

@@ -30,4 +30,15 @@ const setup = () => {
   return {server, client};
 };
 
-runApiTests(setup);
+runApiTests(() => {
+  const client = setup().client;
+  const call = client.call.bind(client);
+  const call$ = client.call$.bind(client);
+  const stop = client.stop.bind(client);
+  return {
+    call,
+    call$,
+    stop,
+    client: {call, call$, stop},
+  };
+});

src/common/rpc/caller/__tests__/RpcApiCaller.spec.ts

@@ -105,17 +105,21 @@ describe('streaming calls', () => {
 describe('smoke tests', () => {
   runApiTests(() => {
     const {caller} = setup();
+    const call$ = (name: any, request: any) =>
+      caller.call$(name, Rx.isObservable(request) ? request : Rx.of(request), {}).pipe(
+        Rx.map((value) => value.data),
+        catchError((error) => {
+          throw error.data;
+        }),
+      );
+    const client = {
+      call$,
+      call: (name: any, request: any) => Rx.firstValueFrom(call$(name, request)),
+      stop: () => {},
+    };
     return {
-      client: {
-        call$: (name: any, request: any) =>
-          caller.call$(name, Rx.isObservable(request) ? request : Rx.of(request), {}).pipe(
-            Rx.map((value) => value.data),
-            catchError((error) => {
-              throw error.data;
-            }),
-          ),
-        stop: () => {},
-      },
+      ...client,
+      client,
     };
   });
 });

src/common/rpc/client/__tests__/StaticRpcClient.spec.ts

@@ -19,4 +19,15 @@ const setup = () => {
   return {server, client};
 };
 
-runApiTests(setup);
+runApiTests(() => {
+  const client = setup().client;
+  const call = client.call.bind(client);
+  const call$ = client.call$.bind(client);
+  const stop = client.stop.bind(client);
+  return {
+    call,
+    call$,
+    stop,
+    client: {call, call$, stop},
+  };
+});