@velocitycareerlabs/server-webwallet 1.26.0-dev-build.1cce50406 → 1.26.0-dev-build.1a6aed3a4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@velocitycareerlabs/server-webwallet",
-  "version": "1.26.0-dev-build.1cce50406",
+  "version": "1.26.0-dev-build.1a6aed3a4",
   "description": "Web Wallet application",
   "repository": "https://github.com/velocitycareerlabs/packages",
   "engines": {
@@ -8,7 +8,8 @@
   },
   "main": "src/index.js",
   "scripts": {
-    "test": "jest --config ./jest.config.js --runInBand --coverage",
+    "test": "cross-env NODE_ENV=test node --test --test-concurrency=1 --experimental-test-module-mocks --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout 'test/**/*.test.js'",
+    "test:ci": "NODE_ENV=test node --test --test-concurrency=1 --experimental-test-module-mocks --experimental-test-coverage --test-coverage-include='src/**' --test-reporter=spec --test-reporter=junit --test-reporter-destination=stdout --test-reporter-destination=test-results.junit.xml --test-reporter=lcov --test-reporter-destination=lcov.info 'test/**/*.test.js'",
     "up": "npm run start:debug",
     "start": "node src/index.js",
     "start:dev": "nodemon src/standalone.js",
@@ -33,7 +34,7 @@
     "@fastify/swagger": "^9.0.0",
     "@fastify/swagger-ui": "^5.0.0",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@velocitycareerlabs/migrations": "1.26.0-dev-build.1cce50406",
+    "@velocitycareerlabs/migrations": "1.26.0-dev-build.1a6aed3a4",
     "@verii/auth": "1.0.0-pre.1757456926",
     "@verii/common-functions": "1.0.0-pre.1757456926",
     "@verii/common-schemas": "1.0.0-pre.1757456926",
@@ -68,10 +69,10 @@
     "eslint-plugin-prefer-arrow-functions": "3.6.2",
     "eslint-plugin-prettier": "4.2.5",
     "eslint-watch": "7.0.0",
-    "jest": "29.7.0",
+    "expect": "29.7.0",
     "nock": "14.0.9",
     "nodemon": "3.1.10",
     "prettier": "2.8.8"
   },
-  "gitHead": "58afda1bd7fef44c773b88a1fd6685f2ba006c3a"
+  "gitHead": "ff57e717f15ed96719d3d3473902497913ee1cf5"
 }

package/test/accounts-controller.test.js

@@ -1,26 +1,35 @@
+const {
+  after,
+  afterEach,
+  before,
+  beforeEach,
+  describe,
+  it,
+  mock,
+} = require('node:test');
+
+const { expect } = require('expect');
+
 const usersDid = 'did:example:123';
-const mockGenerateDidJwk = jest.fn().mockResolvedValue(
-  new Promise((resolve) => {
-    resolve({
-      did: usersDid,
-      publicJwk: {},
-      kid: '',
-      keyId: '',
-    });
+const mockGenerateDidJwk = mock.fn(() =>
+  Promise.resolve({
+    did: usersDid,
+    publicJwk: {},
+    kid: '',
+    keyId: '',
   })
 );
 
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-  return {
-    ...originalModule,
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
     VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
+      getInstance: mock.fn(() => ({
+        initialize: mock.fn(() => Promise.resolve(null)),
         generateDidJwk: mockGenerateDidJwk,
-      }),
+      })),
     },
-  };
+  },
 });
 
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
@@ -46,7 +55,7 @@ const auth0userId = '1234567890';
 describe('Test accounts controller', () => {
   let fastify;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     nock('https://localhost/').get('/.well-known/jwks.json').reply(200, jwks);
     await fastify.ready();
@@ -55,16 +64,17 @@ describe('Test accounts controller', () => {
   beforeEach(async () => {
     await mongoDb().collection('accounts').deleteMany({});
     await mongoDb().collection('credentials').deleteMany({});
-    jest.clearAllMocks();
+    mockGenerateDidJwk.mock.resetCalls();
   });
 
   afterEach(async () => {
     nock.cleanAll();
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await fastify.close();
+    mock.reset();
   });
 
   describe('POST /accounts - create or retrieve account', () => {
@@ -99,13 +109,11 @@ describe('Test accounts controller', () => {
         },
       });
       expect(accountsNock.isDone()).toBe(true);
-      expect(mockGenerateDidJwk.mock.calls).toEqual([
-        [
-          {
-            signatureAlgorithm: 'P-256',
-            remoteCryptoServicesToken: 'fooAccessToken',
-          },
-        ],
+      expect(mockGenerateDidJwk.mock.calls[0].arguments).toEqual([
+        {
+          signatureAlgorithm: 'P-256',
+          remoteCryptoServicesToken: 'fooAccessToken',
+        },
       ]);
       const dbCredentials = await mongoDb()
         .collection('credentials')
@@ -142,13 +150,11 @@ describe('Test accounts controller', () => {
       expect(firstResponse.json).toEqual(secondResponse.json);
 
       expect(accountsNock.isDone()).toBe(true);
-      expect(mockGenerateDidJwk.mock.calls).toEqual([
-        [
-          {
-            signatureAlgorithm: 'P-256',
-            remoteCryptoServicesToken: 'fooAccessToken',
-          },
-        ],
+      expect(mockGenerateDidJwk.mock.calls[0].arguments).toEqual([
+        {
+          signatureAlgorithm: 'P-256',
+          remoteCryptoServicesToken: 'fooAccessToken',
+        },
       ]);
     });
 
@@ -180,13 +186,11 @@ describe('Test accounts controller', () => {
       expect(firstResponse.json).toEqual(secondResponse.json);
 
       expect(accountsNock.isDone()).toBe(true);
-      expect(mockGenerateDidJwk.mock.calls).toEqual([
-        [
-          {
-            signatureAlgorithm: 'P-256',
-            remoteCryptoServicesToken: 'fooAccessToken',
-          },
-        ],
+      expect(mockGenerateDidJwk.mock.calls[0].arguments).toEqual([
+        {
+          signatureAlgorithm: 'P-256',
+          remoteCryptoServicesToken: 'fooAccessToken',
+        },
       ]);
     });
 

package/test/consent-controller.test.js

@@ -1,3 +1,17 @@
+const { after, afterEach, before, describe, it, mock } = require('node:test');
+const { expect } = require('expect');
+
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
+    VCLProvider: {
+      getInstance: mock.fn(() => ({
+        initialize: mock.fn(() => Promise.resolve(null)),
+      })),
+    },
+  },
+});
+
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const nock = require('nock');
 // const newError = require('http-errors');
@@ -15,23 +29,11 @@ const auth0Token =
 const auth0userId = '1234567890';
 const usersDid = 'did:example:123';
 
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-  return {
-    ...originalModule,
-    VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-      }),
-    },
-  };
-});
-
 describe('consent-controller', () => {
   let fastify;
   let persistAccounts;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     nock('https://localhost/')
       .persist()
@@ -45,10 +47,12 @@ describe('consent-controller', () => {
     await mongoDb().collection('accounts').deleteMany({});
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await fastify.close();
+    mock.reset();
   });
+
   describe('consent', () => {
     it('should return 200 and create a consent', async () => {
       ({ persistAccounts } = initAccountsFactory(fastify));

package/test/credentials-controller.test.js

@@ -1,14 +1,40 @@
+const {
+  after,
+  afterEach,
+  before,
+  beforeEach,
+  describe,
+  it,
+  mock,
+} = require('node:test');
+
+const { expect } = require('expect');
+
+const searchForOrganizations = mock.fn(() => Promise.resolve(mockIssuers));
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
+    VCLProvider: {
+      getInstance: mock.fn(() => ({
+        initialize: mock.fn(() => Promise.resolve(null)),
+        searchForOrganizations,
+        credentialTypes: mockCredentialTypes,
+      })),
+    },
+  },
+});
+
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { omit } = require('lodash/fp');
 const nock = require('nock');
 const {
   VCLOrganizationsSearchDescriptor,
   VCLFilter,
-  VCLProvider,
 } = require('@verii/vnf-nodejs-wallet-sdk');
 
 const { ObjectId } = require('mongodb');
 const { errorResponseMatcher, mongoify } = require('@verii/tests-helpers');
+const { mockIssuers, mockCredentialTypes } = require('./mocks');
 const buildFastify = require('./helpers/webwallet-build-fastify');
 const {
   mockDisplayDescriptor,
@@ -21,28 +47,11 @@ const auth0Token =
   // eslint-disable-next-line max-len
   'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IktFWSJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlzcyI6Imh0dHBzOi8vbG9jYWxob3N0LyIsImF1ZCI6ImZvbyIsInNjb3BlIjoicmVhZDp1c2VycyJ9.VwIIUqx9T-AxqbfL_FyNRAeOxTwiC2JpcwtrqnEWN3DdF07ijUkF1WYy8Ahfr_p4R3KnoPbiefZnIbVANCt-lt0ej32rfil2yHhQEsvFxSOjcrx6ARmPp0YAfWlN-5Sotzkxy29jaOZMEDkmRFZg3jkdC7wosPW_S6M-olC4g3HHfylpZI8O3Jdd87Qr9wD_QtUzANwnPbl2Q-9NEyxVjAZIWg_HWK9JAAaf_2IY5VwHBvyp0oeQSEHKi4hogcM59EOc4FxdR5WH45B_PenVa6W4mHFBkH8sAXxt2Zs9s2efujkfWYfyXvgL_lN7vT-TEADlAPP2L6CpWpDISOMsQWUSgGHcN_KwRh_E7qJwahR6mv4QHY6ReEoyjkmSS3swrD1l74jNs7QLAdsMywvzCMDsHabs7DYcEMGQBdP14PJ_ucLFnkivZeBDAc6sS445ocbyrpyO40XMaMorD5khRd9ej89SxR7d_v0W6Ne2Nn4XgW3pAZzu5Rdc4JvqfzLFxkp95jxy1MTAddjWISPmNOYYyXHM9SSqSpqVECOFS0f4z2zycHRqXUcOytWrvED6VGo9x7-IVCgu8vFzj0zToIWQmsDs3UoH9RnV12z0PMwGXQzca1lT_zGwJxBF3e4zJjmcJ05OMF2JgZ2_G48O3M4Dtb0jlgWbKLd0kWlIFzQ;';
 
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const { mockIssuers, mockCredentialTypes } = require('./mocks');
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-  return {
-    ...originalModule,
-    VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-        searchForOrganizations: jest.fn().mockResolvedValue(mockIssuers),
-        credentialTypes: mockCredentialTypes,
-      }),
-    },
-  };
-});
-
-const vclSdk = VCLProvider.getInstance();
-
 describe('Test credentials controller', () => {
   let fastify;
   let persistCredentials;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     nock('https://localhost/').get('/.well-known/jwks.json').reply(200, jwks);
 
@@ -58,9 +67,10 @@ describe('Test credentials controller', () => {
     nock.cleanAll();
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await fastify.close();
+    mock.reset();
   });
 
   describe('GET /credentials - get list of credentials for current user', () => {
@@ -87,13 +97,12 @@ describe('Test credentials controller', () => {
 
       expect(response.statusCode).toBe(200);
 
-      expect(vclSdk.searchForOrganizations).toHaveBeenCalledTimes(1);
-      expect(vclSdk.searchForOrganizations).toHaveBeenCalledWith(
+      expect(searchForOrganizations.mock.callCount()).toEqual(1);
+      expect(searchForOrganizations.mock.calls[0].arguments).toEqual([
         new VCLOrganizationsSearchDescriptor(
           new VCLFilter(currentUserCredential.issuer.id)
-        )
-      );
-      // expect(global.fetch.mock.calls).toHaveLength(1);
+        ),
+      ]);
 
       expect(response.json).toEqual({
         credentials: [
@@ -136,8 +145,6 @@ describe('Test credentials controller', () => {
       expect(response.json.message).toBe(
         'Failed to fetch descriptor from http://lib.localhost.test/display-descriptors/open-badge-v2.0.descriptor.json'
       );
-
-      // expect(global.fetch.mock.calls).toHaveLength(1);
     });
 
     it('should return empty array of credentials if there are no items in DB for user Id', async () => {

package/test/crypro-services/jwt-sign-service-impl.test.js

@@ -1,3 +1,17 @@
+const { after, afterEach, before, describe, it, mock } = require('node:test');
+const { expect } = require('expect');
+
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
+    VCLProvider: {
+      getInstance: mock.fn(() => ({
+        initialize: mock.fn(() => Promise.resolve(null)),
+      })),
+    },
+  },
+});
+
 const nock = require('nock');
 const { VCLJwtDescriptor } = require('@verii/vnf-nodejs-wallet-sdk');
 const buildFastify = require('../helpers/webwallet-build-fastify');
@@ -11,27 +25,14 @@ const {
 } = require('../../src/plugins/crypto-services/jwt-sign-service-impl');
 const { DidJwkMocks } = require('../mocks/didjwk');
 
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-  return {
-    ...originalModule,
-    VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-      }),
-    },
-  };
-});
-
 describe('sign service implementation test', () => {
   let subject;
 
   let fastify;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     await fastify.ready();
-
     subject = JwtSignServiceImpl(fastify);
   });
 
@@ -72,8 +73,9 @@ describe('sign service implementation test', () => {
     nock.cleanAll();
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await fastify.close();
+    mock.reset();
   });
 });

package/test/crypro-services/jwt-verify-service-impl.test.js

@@ -1,3 +1,7 @@
+const { before, describe, it } = require('node:test');
+
+const { expect } = require('expect');
+
 const {
   JwtVerifyServiceImpl,
 } = require('../../src/plugins/crypto-services/jwt-verify-service-impl');
@@ -7,7 +11,7 @@ const { DidJwkMocks } = require('../mocks/didjwk');
 describe('sign service implementation test', () => {
   let subject;
 
-  beforeAll(async () => {
+  before(async () => {
     subject = JwtVerifyServiceImpl();
   });
 

package/test/crypro-services/key-service-impl.test.js

@@ -1,3 +1,17 @@
+const { after, afterEach, before, describe, it, mock } = require('node:test');
+const { expect } = require('expect');
+
+mock.module('@verii/vnf-nodejs-wallet-sdk', {
+  namedExports: {
+    ...require('@verii/vnf-nodejs-wallet-sdk'),
+    VCLProvider: {
+      getInstance: mock.fn(() => ({
+        initialize: mock.fn(() => Promise.resolve(null)),
+      })),
+    },
+  },
+});
+
 const {
   VCLDidJwkDescriptor,
   VCLSignatureAlgorithm,
@@ -9,24 +23,12 @@ const {
 const { DidJwkMocks } = require('../mocks/didjwk');
 const buildFastify = require('../helpers/webwallet-build-fastify');
 
-jest.mock('@verii/vnf-nodejs-wallet-sdk', () => {
-  const originalModule = jest.requireActual('@verii/vnf-nodejs-wallet-sdk');
-  return {
-    ...originalModule,
-    VCLProvider: {
-      getInstance: jest.fn().mockReturnValue({
-        initialize: jest.fn().mockResolvedValue(null),
-      }),
-    },
-  };
-});
-
 describe('key service implementation test', () => {
   let subject;
 
   let fastify;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     await fastify.ready();
 
@@ -67,8 +69,9 @@ describe('key service implementation test', () => {
     nock.cleanAll();
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.restore();
     await fastify.close();
+    mock.reset();
   });
 });