@verii/server-credentialagent 1.0.0-pre.1756100765 → 1.0.0-pre.1756224043

package/e2e/org-registration-and-issuing.e2e.test.js

@@ -14,6 +14,10 @@
  * limitations under the License.
  *
  */
+
+const { after, before, describe, it } = require('node:test');
+const { expect } = require('expect');
+
 const console = require('console');
 const { MongoClient } = require('mongodb');
 const { nanoid } = require('nanoid');
@@ -88,10 +92,10 @@ describe('org registration and issuing e2e', () => {
   // let holderKeyPair;
   // let holderDid;
 
-  afterAll(async () => {
+  after(async () => {
     await client.close();
   });
-  beforeAll(async () => {
+  before(async () => {
     client = await MongoClient.connect('mongodb://localhost:17017');
 
     // Generate holder DID and key pair for fake wallet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verii/server-credentialagent",
-  "version": "1.0.0-pre.1756100765",
+  "version": "1.0.0-pre.1756224043",
   "description": "Credential Agent application",
   "main": "src/index.js",
   "repository": "https://github.com/LFDT-Verii/core",
@@ -8,13 +8,15 @@
     "node": ">=22.11.0"
   },
   "scripts": {
-    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest ./test --config ./jest.config.js --runInBand --coverage",
-    "test:e2e": "cross-env NODE_OPTIONS=--experimental-vm-modules jest ./e2e/org-registration-and-issuing.e2e.test.js --config ./jest.config.js --runInBand",
+    "test": "cross-env NODE_ENV=test node --test --test-concurrency=1 --test-timeout=1200000 --experimental-test-module-mocks --experimental-test-coverage --test-reporter=spec --test-reporter-destination=stdout 'test/**/*.test.js'",
+    "test:ci": "cross-env NODE_ENV=test node --test --test-concurrency=1 --test-timeout=1200000 --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'",
+    "test:e2e": "node --test --test-concurrency=1 --test-timeout=300000 --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 'e2e/*.test.js'",
     "start": "node src/main.js",
     "start:dev": "node --throw-deprecation src/standalone.js",
     "start-operator": "node src/main-operator.js",
     "start-holder": "node src/main-holder.js",
-    "lint": "eslint . --format json >> eslint.json",
+    "lint": "eslint --ext .js .",
+    "lint:ci": "eslint . --format json >> eslint-results.json",
     "lint:fix": "eslint --fix --ext .js .",
     "migrate:status": "./node_modules/.bin/migrate-mongo status --file migrate-mongo.config.js",
     "migrate:create": "./node_modules/.bin/migrate-mongo create --file migrate-mongo.config.js",
@@ -38,31 +40,31 @@
     "@fastify/view": "^11.0.0",
     "@spencejs/spence-factories": "^0.10.2",
     "@spencejs/spence-mongo-repos": "^0.10.2",
-    "@verii/auth": "1.0.0-pre.1756100765",
-    "@verii/base-contract-io": "1.0.0-pre.1756100765",
-    "@verii/blockchain-functions": "1.0.0-pre.1756100765",
-    "@verii/common-fetchers": "1.0.0-pre.1756100765",
-    "@verii/common-functions": "1.0.0-pre.1756100765",
-    "@verii/common-schemas": "1.0.0-pre.1756100765",
-    "@verii/config": "1.0.0-pre.1756100765",
-    "@verii/contract-permissions": "1.0.0-pre.1756100765",
-    "@verii/crypto": "1.0.0-pre.1756100765",
-    "@verii/csv-parser": "1.0.0-pre.1756100765",
-    "@verii/db-kms": "1.0.0-pre.1756100765",
-    "@verii/did-doc": "1.0.0-pre.1756100765",
-    "@verii/fastify-plugins": "1.0.0-pre.1756100765",
-    "@verii/jwt": "1.0.0-pre.1756100765",
-    "@verii/metadata-registration": "1.0.0-pre.1756100765",
-    "@verii/organizations-registry": "1.0.0-pre.1756100765",
-    "@verii/request": "1.0.0-pre.1756100765",
-    "@verii/rest-queries": "1.0.0-pre.1756100765",
-    "@verii/server-provider": "1.0.0-pre.1756100765",
-    "@verii/spencer-mongo-extensions": "1.0.0-pre.1756100765",
-    "@verii/test-regexes": "1.0.0-pre.1756100765",
-    "@verii/validation": "1.0.0-pre.1756100765",
-    "@verii/vc-checks": "1.0.0-pre.1756100765",
-    "@verii/verii-issuing": "1.0.0-pre.1756100765",
-    "@verii/verii-verification": "1.0.0-pre.1756100765",
+    "@verii/auth": "1.0.0-pre.1756224043",
+    "@verii/base-contract-io": "1.0.0-pre.1756224043",
+    "@verii/blockchain-functions": "1.0.0-pre.1756224043",
+    "@verii/common-fetchers": "1.0.0-pre.1756224043",
+    "@verii/common-functions": "1.0.0-pre.1756224043",
+    "@verii/common-schemas": "1.0.0-pre.1756224043",
+    "@verii/config": "1.0.0-pre.1756224043",
+    "@verii/contract-permissions": "1.0.0-pre.1756224043",
+    "@verii/crypto": "1.0.0-pre.1756224043",
+    "@verii/csv-parser": "1.0.0-pre.1756224043",
+    "@verii/db-kms": "1.0.0-pre.1756224043",
+    "@verii/did-doc": "1.0.0-pre.1756224043",
+    "@verii/fastify-plugins": "1.0.0-pre.1756224043",
+    "@verii/jwt": "1.0.0-pre.1756224043",
+    "@verii/metadata-registration": "1.0.0-pre.1756224043",
+    "@verii/organizations-registry": "1.0.0-pre.1756224043",
+    "@verii/request": "1.0.0-pre.1756224043",
+    "@verii/rest-queries": "1.0.0-pre.1756224043",
+    "@verii/server-provider": "1.0.0-pre.1756224043",
+    "@verii/spencer-mongo-extensions": "1.0.0-pre.1756224043",
+    "@verii/test-regexes": "1.0.0-pre.1756224043",
+    "@verii/validation": "1.0.0-pre.1756224043",
+    "@verii/vc-checks": "1.0.0-pre.1756224043",
+    "@verii/verii-issuing": "1.0.0-pre.1756224043",
+    "@verii/verii-verification": "1.0.0-pre.1756224043",
     "ajv": "8.17.1",
     "canonicalize": "^2.1.0",
     "date-fns": "~3.6.0",
@@ -81,10 +83,10 @@
   },
   "devDependencies": {
     "@spencejs/spence-config": "0.10.2",
-    "@verii/endpoints-organizations-registrar": "1.0.0-pre.1756100765",
-    "@verii/sample-data": "1.0.0-pre.1756100765",
+    "@verii/endpoints-organizations-registrar": "1.0.0-pre.1756224043",
+    "@verii/sample-data": "1.0.0-pre.1756224043",
     "@verii/test-regexes": "0.5.0-build",
-    "@verii/tests-helpers": "1.0.0-pre.1756100765",
+    "@verii/tests-helpers": "1.0.0-pre.1756224043",
     "cheerio": "1.1.2",
     "dotenv": "16.6.1",
     "eslint": "8.57.1",
@@ -96,7 +98,7 @@
     "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",
     "jest-json-schema": "6.1.0",
     "jose": "5.10.0",
     "migrate-mongo": "12.1.3",
@@ -105,5 +107,5 @@
     "prettier": "2.8.8",
     "qs": "6.14.0"
   },
-  "gitHead": "90dc37c28dec2f448c472b20541e052552b7612a"
+  "gitHead": "21747614a1db416654bba4c198d1c1b883dbe6a5"
 }

package/test/combined/app-redirect.test.js

@@ -14,6 +14,16 @@
  * limitations under the License.
  */
 
+const {
+  after,
+  afterEach,
+  before,
+  beforeEach,
+  describe,
+  it,
+} = require('node:test');
+const { expect } = require('expect');
+
 const nock = require('nock');
 const cheerio = require('cheerio');
 const buildFastify = require('./helpers/credentialagent-build-fastify');
@@ -37,21 +47,20 @@ const setupNock = () => {
 describe('app redirect controller test', () => {
   let fastify;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = await buildFastify();
     await fastify.ready();
   });
 
   beforeEach(async () => {
     nock.cleanAll();
-    jest.resetAllMocks();
   });
 
   afterEach(() => {
     nock.cleanAll();
   });
 
-  afterAll(async () => {
+  after(async () => {
     await fastify.close();
     nock.cleanAll();
     nock.restore();

package/test/combined/manifest.json.test.js

@@ -13,16 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const { after, before, describe, it } = require('node:test');
+const { expect } = require('expect');
 
 const buildFastify = require('./helpers/credentialagent-build-fastify');
 
 describe('Android manifest.json and related files test suite', () => {
   let fastify;
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
   });
 
-  afterAll(async () => {
+  after(async () => {
     await fastify.close();
   });
 

package/test/combined/root-controller.test.js

@@ -13,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const { after, before, afterEach, describe, it } = require('node:test');
+const { expect } = require('expect');
 
 const nock = require('nock');
 const buildFastify = require('./helpers/credentialagent-build-fastify');
@@ -20,7 +22,7 @@ const buildFastify = require('./helpers/credentialagent-build-fastify');
 describe('root controller test', () => {
   let fastify;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     await fastify.ready();
   });
@@ -29,7 +31,7 @@ describe('root controller test', () => {
     nock.cleanAll();
   });
 
-  afterAll(async () => {
+  after(async () => {
     await fastify.close();
     nock.cleanAll();
     nock.restore();

package/test/combined/validate-cao-plugin.test.js

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+const { afterEach, beforeEach, describe, it, mock } = require('node:test');
+const { expect } = require('expect');
+
 const nock = require('nock');
 const { ServiceCategories } = require('@verii/organizations-registry');
 const {
@@ -24,17 +27,14 @@ const buildFastify = require('../operator/helpers/credentialagent-operator-build
 
 describe('validate cao plugin test suite', () => {
   let fastify;
-  let warnSpy;
 
   beforeEach(async () => {
     fastify = buildFastify();
     await fastify.ready();
-    warnSpy = jest.spyOn(fastify.log, 'warn').mockImplementation(() => {});
   });
 
   afterEach(async () => {
     await fastify.close();
-    warnSpy.mockRestore();
   });
 
   it('should warn if cao service does not exist', async () => {
@@ -77,7 +77,7 @@ describe('validate cao plugin test suite', () => {
     );
   });
 
-  it('should warn if register does not response', async () => {
+  it('should ignore if register does not respond', async () => {
     await validateCao.call({
       ...fastify,
       config: {
@@ -85,13 +85,9 @@ describe('validate cao plugin test suite', () => {
         caoDid: 'didtest',
       },
     });
-    expect(warnSpy).toHaveBeenCalledTimes(1);
-    expect(warnSpy).toHaveBeenCalledWith(
-      'The registrar was not available for the request. Please check your firewall settings.'
-    );
   });
 
-  it('should warn if CAO DID validation turned off', async () => {
+  it('should ignore if CAO DID validation turned off', async () => {
     await validateCao.call({
       ...fastify,
       config: {
@@ -99,8 +95,6 @@ describe('validate cao plugin test suite', () => {
         validateCaoDid: false,
       },
     });
-    expect(warnSpy).toHaveBeenCalledTimes(1);
-    expect(warnSpy).toHaveBeenCalledWith('CAO DID validation is turned off.');
   });
 
   it('should not warn for valid cao', async () => {
@@ -120,11 +114,10 @@ describe('validate cao plugin test suite', () => {
         caoDid: 'didtest',
       },
     });
-    expect(warnSpy).toHaveBeenCalledTimes(0);
   });
 
   it('should not add validation if is test env', async () => {
-    const mockAddHook = jest.fn();
+    const mockAddHook = mock.fn();
     validateCaoPlugin(
       {
         config: {
@@ -135,11 +128,11 @@ describe('validate cao plugin test suite', () => {
       {},
       () => {}
     );
-    expect(mockAddHook).toHaveBeenCalledTimes(0);
+    expect(mockAddHook.mock.callCount()).toEqual(0);
   });
 
   it('should add validation hook', async () => {
-    const mockAddHook = jest.fn();
+    const mockAddHook = mock.fn();
     validateCaoPlugin(
       {
         config: {
@@ -150,6 +143,6 @@ describe('validate cao plugin test suite', () => {
       {},
       () => {}
     );
-    expect(mockAddHook).toHaveBeenCalledTimes(1);
+    expect(mockAddHook.mock.callCount()).toEqual(1);
   });
 });

package/test/get-push-delegate.test.js

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+const { describe, it } = require('node:test');
+const { expect } = require('expect');
+
 const {
   getPushDelegate,
 } = require('../src/entities/push-delegate/get-push-delegate');

package/test/helpers/jwt-vc-expectation.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-
+const { expect } = require('expect');
 const {
   castArray,
   compact,

package/test/holder/build-request-response-schema.test.js

@@ -15,6 +15,8 @@
  *
  */
 
+const { describe, it } = require('node:test');
+const { expect } = require('expect');
 const { buildRequestResponseSchema } = require('../../src/entities');
 
 describe('build request response schema test suite', () => {

package/test/holder/credential-manifest-controller.test.js

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+const { after, before, beforeEach, describe, it } = require('node:test');
+const { expect } = require('expect');
+
 const { isEmpty, omit } = require('lodash/fp');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { ObjectId } = require('mongodb');
@@ -59,7 +62,7 @@ describe('get credential manifests', () => {
   let orgDidDoc;
   let keyPair;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     await fastify.ready();
     ({ persistTenant } = initTenantFactory(fastify));
@@ -69,7 +72,6 @@ describe('get credential manifests', () => {
   });
 
   beforeEach(async () => {
-    jest.resetAllMocks();
     nock.cleanAll();
     fastify.resetOverrides();
 
@@ -113,7 +115,7 @@ describe('get credential manifests', () => {
     nockRegistrarGetOrganizationDidDoc(orgDidDoc.id, orgDidDoc);
   });
 
-  afterAll(async () => {
+  after(async () => {
     nock.cleanAll();
     nock.restore();
     await fastify.close();

package/test/holder/e2e-issuing-controller.test.js

@@ -15,6 +15,9 @@
  *
  */
 
+const { after, before, beforeEach, describe, it } = require('node:test');
+const { expect } = require('expect');
+
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const {
   mongoFactoryWrapper,
@@ -65,9 +68,7 @@ let persistOffer;
 let persistOfferExchange;
 let persistVendorUserIdMapping;
 
-describe('e2e issuing tests', () => {
-  jest.setTimeout(45000);
-
+describe('e2e issuing tests', { timeout: 45000 }, () => {
   let tenant;
   let tenantKeys;
   let disclosure;
@@ -78,7 +79,7 @@ describe('e2e issuing tests', () => {
   let keyPair;
   let operatorKeyPair;
 
-  beforeAll(async () => {
+  before(async () => {
     await mongoFactoryWrapper('test-credential-agent', {
       log: console,
     });
@@ -192,8 +193,6 @@ describe('e2e issuing tests', () => {
   });
 
   beforeEach(async () => {
-    jest.resetAllMocks();
-
     await mongoDb().collection('disclosures').deleteMany({});
     await mongoDb().collection('exchanges').deleteMany({});
     await mongoDb().collection('offers').deleteMany({});
@@ -227,7 +226,7 @@ describe('e2e issuing tests', () => {
     offer = await persistFinalizableOffer();
   });
 
-  afterAll(async () => {
+  after(async () => {
     await fastify.close();
     nock.cleanAll();
     nock.restore();

package/test/holder/get-exchange-progress-controller.test.js

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+const { after, before, beforeEach, describe, it } = require('node:test');
+const { expect } = require('expect');
+
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { generateKeyPair } = require('@verii/crypto');
 
@@ -64,7 +67,7 @@ describe('Get exchange progress test suite', () => {
       exchangeKeyDatum.kidFragment
     );
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     await fastify.ready();
     ({ persistOfferExchange } = initOfferExchangeFactory(fastify));
@@ -90,7 +93,7 @@ describe('Get exchange progress test suite', () => {
     user = await persistVendorUserIdMapping({ tenant });
   });
 
-  afterAll(async () => {
+  after(async () => {
     await fastify.close();
   });
 

package/test/holder/get-presentation-request.test.js

@@ -14,6 +14,9 @@
  * limitations under the License.
  *
  */
+const { after, before, beforeEach, describe, it } = require('node:test');
+const { expect } = require('expect');
+
 const nock = require('nock');
 const { mongoDb } = require('@spencejs/spence-mongo-repos');
 const { ObjectId } = require('mongodb');
@@ -72,7 +75,7 @@ describe('presentation request', () => {
   let nonDisclosure;
   let orgDidDoc;
 
-  beforeAll(async () => {
+  before(async () => {
     fastify = buildFastify();
     await fastify.ready();
     ({ persistDisclosure } = initDisclosureFactory(fastify));
@@ -81,7 +84,6 @@ describe('presentation request', () => {
   });
 
   beforeEach(async () => {
-    jest.resetAllMocks();
     nock.cleanAll();
 
     await mongoDb().collection('disclosures').deleteMany({});
@@ -151,7 +153,7 @@ describe('presentation request', () => {
       );
   });
 
-  afterAll(async () => {
+  after(async () => {
     await fastify.close();
     nock.cleanAll();
     nock.restore();

package/test/holder/helpers/jwt-access-token-expectation.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  *
  */
+const { expect } = require('expect');
 
 const jwtAccessTokenExpectation = (tenant, header, payload) => ({
   header: { alg: 'ES256K', typ: 'JWT', kid: '#exchanges-1', ...header },

package/test/holder/helpers/jwt-vc-expectation.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-
+const { expect } = require('expect');
 const {
   compact,
   isNil,