Fix up more tests

subquery · Dec 11, 2024 · a0e730a · a0e730a
1 parent 9060e9f
commit a0e730a
Showing 1 changed file with 17 additions and 11 deletions.
diff --git a/packages/node/src/indexer/x-provider/x-provider.spec.ts b/packages/node/src/indexer/x-provider/x-provider.spec.ts
@@ -12,21 +12,28 @@ const TEST_BLOCKHASH =
 describe('ApiPromiseConnection', () => {
   let wsProvider: WsProvider;
   let httpProvider: HttpProvider;
+  let wsSpy: jest.SpyInstance;
+  let httpSpy: jest.SpyInstance;
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     const ws = await new WsProvider('wss://kusama.api.onfinality.io/public-ws')
       .isReady;
     const http = new HttpProvider('https://kusama.api.onfinality.io/public');
 
+    // Spys created before the send function is modified
+    wsSpy = jest.spyOn(ws, 'send');
+    httpSpy = jest.spyOn(http, 'send');
+
     wsProvider = createCachedProvider(ws);
     httpProvider = createCachedProvider(http);
+  });
 
-    // TODO these don't work any more because the send method gets replaced
-    jest.spyOn(ws, 'send');
-    jest.spyOn(http, 'send');
+  afterEach(() => {
+    wsSpy.mockClear();
+    httpSpy.mockClear();
   });
 
-  afterEach(async () => {
+  afterAll(async () => {
     await Promise.all([wsProvider?.disconnect(), httpProvider?.disconnect()]);
   });
 
@@ -35,32 +42,31 @@ describe('ApiPromiseConnection', () => {
       wsProvider.send('state_getRuntimeVersion', [TEST_BLOCKHASH]),
       wsProvider.send('state_getRuntimeVersion', [TEST_BLOCKHASH]),
     ]);
-
-    expect(wsProvider.send).toHaveBeenCalledTimes(1);
+    expect(wsSpy).toHaveBeenCalledTimes(1);
   });
 
   it('should not make duplicate requests for chain_getHeader on wsProvider', async () => {
     await Promise.all([
       wsProvider.send('chain_getHeader', [TEST_BLOCKHASH]),
       wsProvider.send('chain_getHeader', [TEST_BLOCKHASH]),
     ]);
-    expect(wsProvider.send).toHaveBeenCalledTimes(1);
+    expect(wsSpy).toHaveBeenCalledTimes(1);
   });
 
   it('should not make duplicate requests for state_getRuntimeVersion on httpProvider', async () => {
     await Promise.all([
       httpProvider.send('state_getRuntimeVersion', [TEST_BLOCKHASH]),
       httpProvider.send('state_getRuntimeVersion', [TEST_BLOCKHASH]),
     ]);
-    expect(httpProvider.send).toHaveBeenCalledTimes(1);
+    expect(httpSpy).toHaveBeenCalledTimes(1);
   });
 
   it('should not make duplicate requests for chain_getHeader on httpProvider', async () => {
     await Promise.all([
       httpProvider.send('chain_getHeader', [TEST_BLOCKHASH]),
       httpProvider.send('chain_getHeader', [TEST_BLOCKHASH]),
     ]);
-    expect(httpProvider.send).toHaveBeenCalledTimes(1);
+    expect(httpSpy).toHaveBeenCalledTimes(1);
   });
 
   it('should not cache requests if there are no args', async () => {
@@ -69,7 +75,7 @@ describe('ApiPromiseConnection', () => {
     await delay(7);
     const result2 = await httpProvider.send('chain_getHeader', []);
 
-    expect(httpProvider.send).toHaveBeenCalledTimes(2);
+    expect(httpSpy).toHaveBeenCalledTimes(2);
     expect(result1).not.toEqual(result2);
   }, 10000);
 });