Fix tests

.env.sample

@@ -0,0 +1,3 @@
+DATOCMS_ACCOUNT_EMAIL=""
+DATOCMS_ACCOUNT_PASSWORD=""
+DATOCMS_ORGANIZATION_ID=""

.github/workflows/node.js.yml

@@ -26,3 +26,7 @@ jobs:
       - run: ./node_modules/.bin/lerna bootstrap
       - run: npm run build --if-present
       - run: npm test
+        env:
+          DATOCMS_ACCOUNT_EMAIL: ${{ secrets.DATOCMS_ACCOUNT_EMAIL }}
+          DATOCMS_ACCOUNT_PASSWORD: ${{ secrets.DATOCMS_ACCOUNT_PASSWORD }}
+          DATOCMS_ORGANIZATION_ID: ${{ secrets.DATOCMS_ORGANIZATION_ID }}

jest-helpers/generateNewCmaClient.ts

@@ -1,6 +1,5 @@
-import { buildClient, ClientConfigOptions } from '../packages/cma-client-node';
-
 import { fetch as ponyfillFetch } from '@whatwg-node/fetch';
+import { buildClient, ClientConfigOptions } from '../packages/cma-client-node';
 import { generateNewDashboardClient } from './generateNewDashboardClient';
 
 const fetchFn = typeof fetch === 'undefined' ? ponyfillFetch : fetch;
@@ -15,12 +14,16 @@ export async function generateNewCmaClient(
 ) {
   const dashboardClient = await generateNewDashboardClient();
 
+  const randomString =
+    Math.random().toString(36).substring(7) + new Date().getTime();
+
   const site = await dashboardClient.sites.create({
-    name: 'Project',
+    name: `Project ${randomString}`,
   });
 
   return buildClient({
     ...extraConfig,
+    // biome-ignore lint/style/noNonNullAssertion: We're owners of the site, so readwrite_token is present
     apiToken: site.readwrite_token!,
     ...baseConfigOptions,
   });

jest-helpers/generateNewDashboardClient.ts

@@ -1,6 +1,9 @@
-import { buildClient, ClientConfigOptions } from '../packages/dashboard-client';
-
 import { fetch as ponyfillFetch } from '@whatwg-node/fetch';
+import {
+  buildClient,
+  Client,
+  ClientConfigOptions,
+} from '../packages/dashboard-client';
 
 const fetchFn = typeof fetch === 'undefined' ? ponyfillFetch : fetch;
 
@@ -11,25 +14,42 @@ export const baseConfigOptions: Partial<ClientConfigOptions> = {
 
 export async function generateNewDashboardClient(
   extraConfig?: Partial<ClientConfigOptions>,
-) {
-  const randomString =
-    Math.random().toString(36).substring(7) + new Date().getTime();
+): Promise<Client> {
+  if (process.env.DATOCMS_SESSION_ID) {
+    return buildClient({
+      ...extraConfig,
+      apiToken: process.env.DATOCMS_SESSION_ID,
+      organization: process.env.DATOCMS_ORGANIZATION_ID,
+      ...baseConfigOptions,
+    });
+  }
+
+  if (
+    !process.env.DATOCMS_ACCOUNT_EMAIL ||
+    !process.env.DATOCMS_ACCOUNT_PASSWORD
+  ) {
+    throw new Error(
+      'DATOCMS_ACCOUNT_EMAIL, DATOCMS_ACCOUNT_PASSWORD (and optionally DATOCMS_ORGANIZATION_ID) environment variables must be set on .env file!',
+    );
+  }
 
   const client = buildClient({
+    ...extraConfig,
     apiToken: null,
     ...baseConfigOptions,
   });
 
-  const account = await client.account.create({
-    email: `${randomString}@delete-this-at-midnight-utc.tk`,
-    password: 'STRONG_pass123!',
-    first_name: 'Test',
-    company: 'DatoCMS',
+  const account = await client.session.rawCreate({
+    data: {
+      type: 'email_credentials',
+      attributes: {
+        email: process.env.DATOCMS_ACCOUNT_EMAIL,
+        password: process.env.DATOCMS_ACCOUNT_PASSWORD,
+      },
+    },
   });
 
-  return buildClient({
-    ...extraConfig,
-    apiToken: account.id,
-    ...baseConfigOptions,
-  });
+  process.env.DATOCMS_SESSION_ID = account.data.id;
+
+  return generateNewDashboardClient(extraConfig);
 }

jest-helpers/globalSetup.ts

@@ -0,0 +1,29 @@
+import 'dotenv/config';
+import { ApiError } from '../packages/dashboard-client';
+import { generateNewDashboardClient } from './generateNewDashboardClient';
+
+export default async () => {
+  const client = await generateNewDashboardClient();
+
+  const siteIds: string[] = [];
+
+  for await (const site of client.sites.listPagedIterator()) {
+    siteIds.push(site.id);
+  }
+
+  await Promise.all(
+    siteIds.map(async (id) => {
+      try {
+        await client.sites.destroy(id);
+      } catch (e) {
+        if (e instanceof ApiError && e.findError('NOT_FOUND')) {
+          // NOP: If multiple processes are running tests in parallel (like in Github Actions)
+          // other processes might have already deleted the project. It's fine, move on.
+          return;
+        }
+
+        throw e;
+      }
+    }),
+  );
+};

jest.config.js

@@ -1,11 +1,13 @@
 module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
+  preset: "ts-jest",
+  testEnvironment: "node",
   testTimeout: 60000,
-  testMatch: ['**/*.test.ts'],
+  testMatch: ["**/*.test.ts"],
   transformIgnorePatterns: [
-    '/packages/cma-client-node/node_modules/(?!(got|p-cancelable|@szmarczak|lowercase-keys)/)',
+    "/packages/cma-client-node/node_modules/(?!(got|p-cancelable|@szmarczak|lowercase-keys)/)",
   ],
+  setupFiles: ["dotenv/config"],
+  globalSetup: "./jest-helpers/globalSetup.ts",
   // collectCoverage: true,
   // collectCoverageFrom: [
   //   'packages/**/*.[jt]s?(x)',

package.json

@@ -33,7 +33,8 @@
     "rome": "^11.0.0",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.7.0",
-    "typescript": "^4.6.3"
+    "typescript": "^4.6.3",
+    "dotenv": "^16.4.1"
   },
   "homepage": "https://github.com/datocms/js-rest-api-clients",
   "repository": {

packages/cma-client-node/__tests__/publicInfo.test.ts

@@ -5,6 +5,6 @@ describe('Public info', () => {
     const client = await generateNewCmaClient();
 
     const publicInfo = await client.publicInfo.find();
-    expect(publicInfo.name).toEqual('Project');
+    expect(publicInfo.name).toContain('Project');
   });
 });

packages/cma-client-node/__tests__/site.test.ts

@@ -5,9 +5,14 @@ describe('site', () => {
     const client = await generateNewCmaClient();
 
     const fetchedSite = await client.site.find();
-    expect(fetchedSite.name).toEqual('Project');
+    expect(fetchedSite.name).toContain('Project');
 
-    const updatedSite = await client.site.update({ name: 'New project' });
-    expect(updatedSite.name).toEqual('New project');
+    const randomString =
+      Math.random().toString(36).substring(7) + new Date().getTime();
+
+    const newName = `New project ${randomString}`;
+
+    const updatedSite = await client.site.update({ name: newName });
+    expect(updatedSite.name).toEqual(newName);
   });
 });