fix unit test

Author: fforbeck

src/bindings.d.ts

@@ -14,6 +14,6 @@ export interface AccountingService {
 }
 
 export interface Accounting {
-  create: ({ serviceURL }: { serviceURL?: string }) => AccountingService
+  create: ({ serviceURL }: { serviceURL: string }) => AccountingService
 }
 

test/unit/middlewares/egress-tracker.spec.js

@@ -75,22 +75,26 @@ const env =
     FF_EGRESS_TRACKER_ENABLED: 'true',
   })
 
-const recordStub = stub('record').callsFake((cid, bytes, servedAt) => {
+const recordFake = sinon.fake((cid, bytes, servedAt) => {
   console.log(`[mock] record called with cid: ${cid}, bytes: ${bytes}, servedAt: ${servedAt}`)
   return Promise.resolve()
 })
 
 /**
- * @type {import('../../../src/bindings.js').AccountingService} 
-*/
-// @ts-expect-error - stub is typed as unknown
-const accountingService = sinon.stub(Accounting, 'create').callsFake(({ serviceURL }) => {
+ * Mock implementation of the AccountingService.
+ * 
+ * @param {Object} options
+ * @param {string} options.serviceURL - The URL of the accounting service.
+ * @returns {import('../../../src/bindings.js').AccountingService}
+ */
+const AccountingService = ({ serviceURL }) => {
   console.log(`[mock] Accounting.create called with serviceURL: ${serviceURL}`)
+
   return {
-    record: recordStub,
-    getTokenMetadata: stub('getTokenMetadata').returns(Promise.resolve(null))
+    record: recordFake,
+    getTokenMetadata: stub('getTokenMetadata')
   }
-})
+}
 
 const ctx =
   /** @satisfies {import('../../../src/handlers/egress-tracker.js').EgressTrackerContext} */
@@ -99,20 +103,15 @@ const ctx =
     waitUntil: stub('waitUntil').returns(undefined),
     path: '',
     searchParams: new URLSearchParams(),
-    ACCOUNTING_SERVICE: accountingService
+    ACCOUNTING_SERVICE: AccountingService({ serviceURL: env.ACCOUNTING_SERVICE_URL })
   })
 
 describe('withEgressTracker', async () => {
 
-  beforeEach(() => {
-    // @ts-expect-error - stub is typed as AccountingService
-    accountingService.reset()
-  })
-
   afterEach(() => {
     sandbox.reset()
-    // @ts-expect-error - stub is typed as AccountingService
-    accountingService.restore()
+    // @ts-expect-error - recordFake is a SinonSpy
+    recordFake.reset()
   })
 
   it('should track egress bytes for a successful request', async () => {
@@ -125,20 +124,21 @@ describe('withEgressTracker', async () => {
       }
     }), { status: 200 })
 
-    const mockHandler = sinon.stub().resolves(mockResponse)
+    const innerHandler = sinon.stub().resolves(mockResponse)
 
-    const handler = withEgressHandler(mockHandler)
+    const handler = withEgressHandler(innerHandler)
     const request = await createRequest()
     const response = await handler(request, env, ctx)
     // Ensure the response body is fully consumed
     const responseBody = await response.text()
 
     expect(response.status).to.equal(200)
     expect(responseBody).to.equal('Hello, world!')
-    expect(recordSpy.calledOnce, 'record should be called once').to.be.true
-    expect(recordSpy.args[0][0], 'first argument should be the cid').to.equal(ctx.dataCid.toString())
-    expect(recordSpy.args[0][1], 'second argument should be the total bytes').to.equal(totalBytes)
+    expect(recordFake.calledOnce, 'record should be called once').to.be.true
+    expect(recordFake.args[0][0], 'first argument should be the cid').to.equal(ctx.dataCid)
+    expect(recordFake.args[0][1], 'second argument should be the total bytes').to.equal(totalBytes)
 
   }).timeout(10_000)
 
+
 })