Merge branch 'develop' into oas/improve-oas-schemas-21

medusajs · Sep 27, 2024 · 228dd4e · 228dd4e
2 parents 44ad480 + 38778b3
commit 228dd4e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/integration-tests/modules/__tests__/cart/store/carts.spec.ts b/integration-tests/modules/__tests__/cart/store/carts.spec.ts
@@ -1,5 +1,4 @@
 import { RemoteLink } from "@medusajs/modules-sdk"
-import PaymentModuleService from "@medusajs/payment/dist/services/payment-module"
 import {
   IApiKeyModuleService,
   ICartModuleService,
@@ -2391,8 +2390,9 @@ medusaIntegrationTestRunner({
         })
 
         it("should return cart when payment authorization fails", async () => {
+          const paymentModuleService = appContainer.resolve(Modules.PAYMENT)
           const authorizePaymentSessionSpy = jest.spyOn(
-            PaymentModuleService.prototype,
+            paymentModuleService,
             "authorizePaymentSession"
           )
 

diff --git a/packages/core/js-sdk/src/client.ts b/packages/core/js-sdk/src/client.ts
@@ -136,19 +136,20 @@ export class Client {
     input: FetchInput,
     init?: FetchArgs
   ): Promise<FetchStreamResponse> {
-    let abort = new AbortController()
+    const abortController = new AbortController()
+    const abortFunc = abortController.abort.bind(abortController)
 
     let res = await this.fetch_(input, {
       ...init,
-      signal: abort.signal,
+      signal: abortController.signal,
       headers: { ...init?.headers, accept: "text/event-stream" },
     })
 
     if (res.ok) {
-      return { stream: events(res, abort.signal), abort: abort.abort }
+      return { stream: events(res, abortController.signal), abort: abortFunc }
     }
 
-    return { stream: null, abort: abort.abort }
+    return { stream: null, abort: abortFunc }
   }
 
   setToken(token: string) {