fix tests

SAP · Sep 24, 2024 · 1539eaf · 1539eaf
1 parent 42bdc72
commit 1539eaf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/packages/connectivity/src/scp-cf/destination/destination-accessor-failure-cases.spec.ts b/packages/connectivity/src/scp-cf/destination/destination-accessor-failure-cases.spec.ts
@@ -22,7 +22,6 @@ import {
   destinationName,
   oauthMultipleResponse
 } from '../../../../../test-resources/test/test-util/example-destination-service-responses';
-import * as jwt from '../jwt';
 import {
   getAllDestinationsFromDestinationService,
   getDestination
@@ -34,9 +33,7 @@ describe('Failure cases', () => {
       xsuaa: [xsuaaBindingMock]
     });
 
-    jest
-      .spyOn(jwt, 'verifyJwt')
-      .mockResolvedValue(jwt.decodeJwt(subscriberServiceToken));
+    mockVerifyJwt();
 
     await expect(
       getDestination({

diff --git a/packages/connectivity/src/scp-cf/destination/get-subscriber-token.spec.ts b/packages/connectivity/src/scp-cf/destination/get-subscriber-token.spec.ts
@@ -1,23 +1,21 @@
 import {
   customSubscriberUserToken,
   mockServiceBindings,
+  mockVerifyJwt,
   onlyIssuerServiceToken,
   onlyIssuerXsuaaUrl,
   subscriberServiceToken,
   subscriberUserToken
 } from '../../../../../test-resources/test/test-util';
 import * as tokenAccessor from '../token-accessor';
-import * as jwtModule from '../jwt';
 import { getJwtPair } from '../jwt';
 import { getSubscriberToken } from './get-subscriber-token';
 
 describe('getSubscriberToken()', () => {
   let verifyJwtSpy;
   beforeEach(() => {
     mockServiceBindings();
-    verifyJwtSpy = jest
-      .spyOn(jwtModule, 'verifyJwt')
-      .mockResolvedValue(undefined as any);
+    verifyJwtSpy = mockVerifyJwt();
   });
 
   afterEach(() => {

diff --git a/test-resources/test/test-util/destination-service-mocks.ts b/test-resources/test/test-util/destination-service-mocks.ts
@@ -1,6 +1,7 @@
 import nock from 'nock';
-import * as sdkJwt from '@sap-cloud-sdk/connectivity/src/scp-cf/jwt';
-import {
+import * as sdkJwtVerify from '@sap-cloud-sdk/connectivity/src/scp-cf/jwt/verify';
+import * as sdkJwtJwt from '@sap-cloud-sdk/connectivity/src/scp-cf/jwt/jwt';
+import type {
   DestinationConfiguration,
   DestinationJson
 } from '@sap-cloud-sdk/connectivity';
@@ -232,6 +233,6 @@ export function mockFetchDestinationCalls(
 
 export function mockVerifyJwt() {
   return jest
-    .spyOn(sdkJwt, 'verifyJwt')
-    .mockImplementation(token => Promise.resolve(sdkJwt.decodeJwt(token)));
+    .spyOn(sdkJwtVerify, 'verifyJwt')
+    .mockImplementation(token => Promise.resolve(sdkJwtJwt.decodeJwt(token)));
 }