[LON-427] Add Vitest

.circleci/config.yml

@@ -56,7 +56,7 @@ jobs:
       - *install_corepack
       - run:
           name: Running tests
-          command: yarn test --maxWorkers=2
+          command: yarn test --pool=threads --poolOptions.threads.maxThreads=2
 
   typecheck:
     <<: *docker_defaults

package.json

@@ -28,8 +28,8 @@
     "prepareRelease": "npm run build && git add dist && npm run build:docs && git add docs",
     "createChangelog": "conventional-changelog -p conventionalcommits && git add CHANGELOG.md",
     "version": "npm run prepareRelease && npm run createChangelog",
-    "test": "jest --no-cache",
-    "test:dev": "jest --watch",
+    "test": "NODE_OPTIONS=--no-webstorage vitest run",
+    "test:dev": "NODE_OPTIONS=--no-webstorage vitest",
     "typecheck": "tsc --noEmit",
     "lint": "eslint",
     "format": "prettier scripts src sample/src --write",
@@ -41,8 +41,6 @@
     "@commitlint/cli": "21.2.1",
     "@commitlint/config-conventional": "21.2.0",
     "@eslint/js": "10.0.1",
-    "@testing-library/jest-dom": "^5.12.0",
-    "@types/jest": "30.0.0",
     "@types/node": "^26.1.2",
     "@typescript-eslint/eslint-plugin": "8.64.0",
     "@typescript-eslint/parser": "8.64.0",
@@ -54,17 +52,15 @@
     "eslint-config-prettier": "10.1.8",
     "globals": "17.7.0",
     "husky": "9.1.7",
-    "jest": "30.4.2",
-    "jest-environment-jsdom": "^30.4.1",
-    "jest-fetch-mock": "^3.0.3",
+    "jsdom": "^29.1.1",
     "prettier": "3.9.5",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
-    "ts-jest": "29.4.12",
     "typedoc": "^0.28.20",
     "typescript": "6.0.3",
     "vite": "^8.1.5",
-    "vite-plugin-node-polyfills": "^0.28.0"
+    "vite-plugin-node-polyfills": "^0.28.0",
+    "vitest": "^4.1.10"
   },
   "packageManager": "yarn@4.14.1"
 }

scripts/jest/setup.ts → scripts/testSetup.ts

@@ -1,9 +1,8 @@
-import '@testing-library/jest-dom';
-import fetchMock from 'jest-fetch-mock';
-import { TextEncoder } from 'util';
+import { TextEncoder } from 'node:util';
 import { webcrypto } from 'node:crypto';
+import { fetchMock } from '../src/test-utils/mockFetch';
 
-fetchMock.enableMocks();
+global.fetch = fetchMock;
 
 // JSDOM doesn't implement these, but browsers do
 // [TextEncoder] https://developer.mozilla.org/en-US/docs/Web/API/TextEncoder

src/api/__tests__/authorize-url.test.ts → src/api/authorize/authorize-url.test.ts

@@ -1,15 +1,15 @@
-import { MY_ACCOUNT_DOMAINS } from '../../server-paths';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
 import { MtLinkSdk } from '../..';
-import authorizeUrl from '../authorize-url';
-import { generateConfigs } from '../../helper';
-import storage from '../../storage';
-import expectUrlToMatchWithPKCE from '../../__tests__/helper/expect-url-to-match';
+import authorizeUrl from './authorize-url';
+import { generateConfigs } from '../../helpers';
+import storage from '../../helpers/storage';
+import expectUrlToMatchWithPKCE from '../../test-utils/expect-url-to-match';
 
-jest.mock('../../storage');
+vi.mock('../../helpers/storage');
 
 describe('api', () => {
   describe('authorize-url', () => {
-    const mockedStorage = jest.mocked(storage);
+    const mockedStorage = vi.mocked(storage);
 
     const clientId = 'clientId';
     const redirectUri = 'redirectUri';

src/api/authorize-url.ts → src/api/authorize/authorize-url.ts

@@ -1,7 +1,13 @@
-import { constructScopes, generateConfigs, mergeConfigs, generateCodeChallenge, objectToQueryString } from '../helper';
-import { MY_ACCOUNT_DOMAINS } from '../server-paths';
-import { StoredOptions, AuthorizeUrlOptions } from '../typings';
-import storage from '../storage';
+import {
+  constructScopes,
+  generateConfigs,
+  mergeConfigs,
+  generateCodeChallenge,
+  objectToQueryString
+} from '../../helpers';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
+import { StoredOptions, AuthorizeUrlOptions } from '../../typings';
+import storage from '../../helpers/storage';
 
 export default async function authorize(
   storedOptions: StoredOptions,

src/api/__tests__/authorize.test.ts → src/api/authorize/authorize.test.ts

@@ -1,18 +1,18 @@
-import { MY_ACCOUNT_DOMAINS } from '../../server-paths';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
 import { AuthorizeOptions, MtLinkSdk } from '../..';
-import authorize from '../authorize';
-import { generateConfigs } from '../../helper';
-import * as helper from '../../helper';
-import storage from '../../storage';
-import expectUrlToMatchWithPKCE from '../../__tests__/helper/expect-url-to-match';
+import authorize from './authorize';
+import { generateConfigs } from '../../helpers';
+import * as helper from '../../helpers';
+import storage from '../../helpers/storage';
+import expectUrlToMatchWithPKCE from '../../test-utils/expect-url-to-match';
 
-jest.mock('../../storage');
+vi.mock('../../helpers/storage');
 
 describe('api', () => {
   describe('authorize', () => {
-    const open = (window.open = jest.fn());
+    const open = (window.open = vi.fn());
 
-    const mockedStorage = jest.mocked(storage);
+    const mockedStorage = vi.mocked(storage);
 
     const clientId = 'clientId';
     const redirectUri = 'redirectUri';
@@ -186,7 +186,7 @@ describe('api', () => {
     });
 
     test('without window', async () => {
-      jest.spyOn(helper, 'hasWindow').mockReturnValue(false);
+      vi.spyOn(helper, 'hasWindow').mockReturnValue(false);
 
       await expect(authorize(new MtLinkSdk().storedOptions)).rejects.toThrow(
         '[mt-link-sdk] `authorize` only works in the browser.'

src/api/authorize.ts → src/api/authorize/authorize.ts

@@ -1,5 +1,5 @@
-import { getIsTabValue, hasWindow, openWindow } from '../helper';
-import { StoredOptions, AuthorizeOptions } from '../typings';
+import { getIsTabValue, hasWindow, openWindow } from '../../helpers';
+import { StoredOptions, AuthorizeOptions } from '../../typings';
 import authorizeUrl from './authorize-url';
 
 export default async function authorize(storedOptions: StoredOptions, options: AuthorizeOptions = {}): Promise<void> {

src/api/__tests__/exchange-token.test.ts → src/api/exchange-token/exchange-token.test.ts

@@ -1,13 +1,17 @@
 declare const __VERSION__: string;
 
-import fetch from 'jest-fetch-mock';
+import { fetchMock, mockResponseOnce, mockRejectOnce } from '../../test-utils/mockFetch';
 
-import { MY_ACCOUNT_DOMAINS } from '../../server-paths';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
 import { MtLinkSdk } from '../..';
-import exchangeToken from '../exchange-token';
-import * as helper from '../../helper';
+import exchangeToken from './exchange-token';
+import * as helper from '../../helpers';
 
 describe('api', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
   describe('exchange-token', () => {
     const clientId = 'clientId';
     const code = 'code';
@@ -56,15 +60,14 @@ describe('api', () => {
     });
 
     test('make request', async () => {
-      fetch.mockClear();
-      fetch.mockResponseOnce(JSON.stringify(token));
+      mockResponseOnce(JSON.stringify(token));
 
       await exchangeToken(mtLinkSdk.storedOptions, { code, codeVerifier: '' });
 
       const url = `${MY_ACCOUNT_DOMAINS.production}/oauth/token.json`;
 
-      expect(fetch).toHaveBeenCalledTimes(1);
-      expect(fetch).toHaveBeenCalledWith(url, {
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+      expect(fetchMock).toHaveBeenCalledWith(url, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -81,10 +84,9 @@ describe('api', () => {
     });
 
     test('failed to request', async () => {
-      const error = 'failed';
+      const error = new Error('failed');
 
-      fetch.mockClear();
-      fetch.mockRejectedValueOnce(error);
+      mockRejectOnce(error);
 
       await expect(exchangeToken(mtLinkSdk.storedOptions, { code, state, redirectUri })).rejects.toThrow(
         `[mt-link-sdk] \`exchangeToken\` execution failed. ${error}`
@@ -94,31 +96,28 @@ describe('api', () => {
     test('throw error on response with error', async () => {
       const error = 'failed';
 
-      fetch.mockClear();
-      fetch.mockResponseOnce(JSON.stringify({ error: 'error', error_description: error }));
+      mockResponseOnce(JSON.stringify({ error: 'error', error_description: error }));
 
       await expect(exchangeToken(mtLinkSdk.storedOptions, { code, state })).rejects.toThrow(error);
     });
 
     test('auto extract code from url query if no code was passed', async () => {
-      fetch.mockClear();
-      fetch.mockResponseOnce(JSON.stringify(token));
+      mockResponseOnce(JSON.stringify(token));
 
       const code = 'realCode';
 
       window.history.pushState({}, '', `?code=otherCode&code=${code}`);
 
       await exchangeToken(mtLinkSdk.storedOptions, { state });
 
-      const result = fetch.mock.calls[0][1] || {};
+      const result = fetchMock.mock.calls[0][1] || {};
       const data = JSON.parse(result.body as string);
 
       expect(data.code).toBe(code);
     });
 
     test('auto extract state from url query if no state was passed or set during init', async () => {
-      fetch.mockClear();
-      fetch.mockResponseOnce(JSON.stringify(token));
+      mockResponseOnce(JSON.stringify(token));
 
       window.history.pushState({}, '', `?state=otherState&state=${state}`);
 
@@ -128,7 +127,7 @@ describe('api', () => {
     });
 
     test('non browser environment will not auto extract code from url', async () => {
-      jest.spyOn(helper, 'hasWindow').mockReturnValue(false);
+      vi.spyOn(helper, 'hasWindow').mockReturnValue(false);
 
       await expect(exchangeToken(mtLinkSdk.storedOptions)).rejects.toThrow(
         '[mt-link-sdk] Missing option `code` in `exchangeToken`, or failed to get `code` from query/hash value from the URL.'

src/api/exchange-token.ts → src/api/exchange-token/exchange-token.ts

@@ -1,7 +1,7 @@
-import { generateSdkHeaderInfo, hasWindow, queryStringToObject } from '../helper';
-import { MY_ACCOUNT_DOMAINS } from '../server-paths';
-import { StoredOptions, ExchangeTokenOptions, Token } from '../typings';
-import storage from '../storage';
+import { generateSdkHeaderInfo, hasWindow, queryStringToObject } from '../../helpers';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
+import { StoredOptions, ExchangeTokenOptions, Token } from '../../typings';
+import storage from '../../helpers/storage';
 
 function getCode(): string | undefined {
   // not available in node environment

src/api/__tests__/logout-url.test.ts → src/api/logout/logout-url.test.ts

@@ -1,7 +1,7 @@
-import { MY_ACCOUNT_DOMAINS } from '../../server-paths';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
 import { MtLinkSdk } from '../..';
-import logoutUrl from '../logout-url';
-import { generateConfigs, objectToQueryString } from '../../helper';
+import logoutUrl from './logout-url';
+import { generateConfigs, objectToQueryString } from '../../helpers';
 
 describe('api', () => {
   describe('logout-url', () => {
@@ -16,7 +16,7 @@ describe('api', () => {
     });
 
     test('after calling init', async () => {
-      window.open = jest.fn();
+      window.open = vi.fn();
 
       const clientId = 'clientId';
       const cobrandClientId = 'cobrandClientId';
@@ -40,7 +40,7 @@ describe('api', () => {
     });
 
     test('with options', async () => {
-      window.open = jest.fn();
+      window.open = vi.fn();
 
       const backTo = 'backTo';
 

src/api/logout-url.ts → src/api/logout/logout-url.ts

@@ -1,6 +1,6 @@
-import { generateConfigs, mergeConfigs, objectToQueryString } from '../helper';
-import { MY_ACCOUNT_DOMAINS } from '../server-paths';
-import { StoredOptions, LogoutUrlOptions } from '../typings';
+import { generateConfigs, mergeConfigs, objectToQueryString } from '../../helpers';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
+import { StoredOptions, LogoutUrlOptions } from '../../typings';
 
 export default async function logoutUrl(storedOptions: StoredOptions, options: LogoutUrlOptions = {}): Promise<string> {
   const { clientId, mode, cobrandClientId, locale, samlSubjectId } = storedOptions;

src/api/__tests__/logout.test.ts → src/api/logout/logout.test.ts

@@ -1,13 +1,13 @@
-import { MY_ACCOUNT_DOMAINS } from '../../server-paths';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
 import { MtLinkSdk } from '../..';
-import logout from '../logout';
-import { generateConfigs, objectToQueryString } from '../../helper';
-import * as helper from '../../helper';
+import logout from './logout';
+import { generateConfigs, objectToQueryString } from '../../helpers';
+import * as helper from '../../helpers';
 
 describe('api', () => {
   describe('logout', () => {
     test('without calling init', async () => {
-      window.open = jest.fn();
+      window.open = vi.fn();
 
       await logout(new MtLinkSdk().storedOptions);
 
@@ -19,7 +19,7 @@ describe('api', () => {
     });
 
     test('after calling init', async () => {
-      window.open = jest.fn();
+      window.open = vi.fn();
 
       const clientId = 'clientId';
       const cobrandClientId = 'cobrandClientId';
@@ -45,7 +45,7 @@ describe('api', () => {
     });
 
     test('with options', async () => {
-      window.open = jest.fn();
+      window.open = vi.fn();
 
       const backTo = 'backTo';
 
@@ -61,7 +61,7 @@ describe('api', () => {
     });
 
     test('without window', async () => {
-      jest.spyOn(helper, 'hasWindow').mockReturnValue(false);
+      vi.spyOn(helper, 'hasWindow').mockReturnValue(false);
 
       await expect(logout(new MtLinkSdk().storedOptions)).rejects.toThrow();
     });

src/api/logout.ts → src/api/logout/logout.ts

@@ -1,5 +1,5 @@
-import { getIsTabValue, hasWindow, openWindow } from '../helper';
-import { StoredOptions, LogoutOptions } from '../typings';
+import { getIsTabValue, hasWindow, openWindow } from '../../helpers';
+import { StoredOptions, LogoutOptions } from '../../typings';
 import logoutUrl from './logout-url';
 
 export default async function logout(storedOptions: StoredOptions, options: LogoutOptions = {}): Promise<void> {

src/api/__tests__/onboard-url.test.ts → src/api/onboard/onboard-url.test.ts

@@ -1,15 +1,15 @@
-import { MY_ACCOUNT_DOMAINS } from '../../server-paths';
+import { MY_ACCOUNT_DOMAINS } from '../../helpers/serverPaths';
 import { MtLinkSdk } from '../..';
-import onboardUrl from '../onboard-url';
-import { generateConfigs } from '../../helper';
-import storage from '../../storage';
-import expectUrlToMatchWithPKCE from '../../__tests__/helper/expect-url-to-match';
+import onboardUrl from './onboard-url';
+import { generateConfigs } from '../../helpers';
+import storage from '../../helpers/storage';
+import expectUrlToMatchWithPKCE from '../../test-utils/expect-url-to-match';
 
-jest.mock('../../storage');
+vi.mock('../../helpers/storage');
 
 describe('api', () => {
   describe('onboard-url', () => {
-    const mockedStorage = jest.mocked(storage);
+    const mockedStorage = vi.mocked(storage);
 
     const clientId = 'clientId';
     const redirectUri = 'redirectUri';