fix: fix api test (#587)

* fix: fix api test
* fix: fix api test result
* Create flat-apes-help.md

Author: riccardoperra

Diff for: .changeset/flat-apes-help.md

@@ -0,0 +1,5 @@
+---
+"@codeimage/api": patch
+---
+
+fix: fix api test

Diff for: .github/workflows/main.yml

@@ -14,8 +14,8 @@ jobs:
     steps:
       - name: Checkout PR
         uses: actions/checkout@v3
-#        with:
-#          submodules: 'true'
+      #        with:
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -58,8 +58,8 @@ jobs:
     steps:
       - name: Checkout PR
         uses: actions/checkout@v3
-#        with:
-#          submodules: 'true'
+      #        with:
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -83,8 +83,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-#        with:
-#          submodules: 'true'
+      #        with:
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -115,8 +115,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-#        with:
-#          submodules: 'true'
+      #        with:
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -155,8 +155,8 @@ jobs:
     steps:
       - name: Checkout PR
         uses: actions/checkout@v3
-#        with:
-#          submodules: 'true'
+      #        with:
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -209,7 +209,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: 'refs/pull/${{ github.event.number }}/merge'
-#          submodules: 'true'
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -262,7 +262,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: 'true'
-#          ref: 'refs/pull/${{ github.event.number }}/merge'
+      #          ref: 'refs/pull/${{ github.event.number }}/merge'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -305,7 +305,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: 'refs/pull/${{ github.event.number }}/merge'
-#          submodules: 'true'
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -355,7 +355,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: 'refs/pull/${{ github.event.number }}/merge'
-#          submodules: 'true'
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -383,8 +383,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-#        with:
-#          submodules: 'true'
+      #        with:
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -445,8 +445,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-#        with:
-#          submodules: 'true'
+      #        with:
+      #          submodules: 'true'
       - name: 📥 Monorepo install
         uses: ./.github/actions/pnpm-install
 
@@ -464,8 +464,11 @@ jobs:
           pnpm exec prisma generate
           pnpm --filter=@codeimage/prisma-models build
 
-      - name: Test
-        run: pnpm --filter=@codeimage/api test:ci
+      - name: Test (unit)
+        run: pnpm --filter=@codeimage/api test:unit
+
+      - name: Test (integration)
+        run: pnpm --filter=@codeimage/api test:integration
 
   deploy-api-next:
     if: ${{ github.head_ref  == 'next' }}
@@ -481,8 +484,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-#        with:
-#          submodules: 'true'
+      #        with:
+      #          submodules: 'true'
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:

Diff for: .github/workflows/prod-deploy.yml

@@ -166,8 +166,11 @@ jobs:
           pnpm exec prisma generate
           pnpm --filter=@codeimage/prisma-models build
 
-      - name: Test
-        run: pnpm --filter=@codeimage/api test:ci
+      - name: Test (unit)
+        run: pnpm --filter=@codeimage/api test:unit
+
+      - name: Test (integration)
+        run: pnpm --filter=@codeimage/api test:integration
 
   typecheck-packages:
     name: Type-checking packages/**

Diff for: .idea/vcs.xml

@@ -15,7 +15,8 @@
   "scripts": {
     "test": "vitest",
     "test:coverage": "vitest --coverage",
-    "test:ci": "vitest run",
+    "test:unit": "RUN_TEST=unit vitest run",
+    "test:integration": "RUN_TEST=integration vitest run",
     "test:ui": "vitest --ui",
     "start": "npm run build:ts && fastify start -l info dist/app.js",
     "start:railway": "fastify start -l info dist/app.js",
@@ -29,6 +30,7 @@
     "prisma:migrate:test": "dotenv -e .env.test -- pnpm exec prisma migrate dev",
     "prisma:migrate:deploy": "prisma migrate deploy",
     "prisma:migrate:deploy-test": "dotenv -e .env.test -- pnpm exec prisma migrate deploy",
+    "prisma:migrate:reset-test": "dotenv -e .env.test -- pnpm exec prisma migrate reset --force",
     "prisma:generate": "prisma generate dev && pnpm --filter=@codeimage/prisma-models build",
     "docker:dev": "docker compose -f docker-compose.dev.yml up",
     "dev:start": "tsx watch node_modules/fastify-cli/cli.js start --ignore-watch=.ts$ -w -l info -P src/app.ts"

Diff for: apps/api/package.json

@@ -1,7 +1,7 @@
 // This file contains code that we reuse between our tests.
-import Fastify from 'fastify';
+import Fastify, {FastifyInstance} from 'fastify';
 import fp from 'fastify-plugin';
-import {Test} from 'vitest';
+import {TestContext} from 'vitest';
 import App from '../src/app.js';
 import {auth0Mock} from './helpers/auth0Mock.js';
 
@@ -14,17 +14,27 @@ async function config(t: any) {
 }
 
 // Automatically build and tear down our instance
-async function build(t: Test) {
+async function build(t: TestContext) {
   const app = Fastify();
 
   // fastify-plugin ensures that all decorators
   // are exposed for testing purposes, this is
   // different from the production setup
-  void app.register(fp(App), await config(t));
+  await app.register(fp(App), await config(t));
 
   await app.ready();
-
   return app;
 }
 
+export function withFastifyApp<T>(
+  test: (context: TestContext & T, fastify: FastifyInstance) => Promise<void>,
+  configFn: (a: any) => Promise<any> = config,
+) {
+  return async (context: TestContext & T) => {
+    const app = await build(await configFn(context));
+    await test(context, app);
+    await app.close();
+  };
+}
+
 export {config, build};

Diff for: apps/api/test/before-test.ts

@@ -2,21 +2,28 @@ import {PrismaClient} from '@codeimage/prisma-models';
 import * as crypto from 'crypto';
 import {testPresetUtils} from '../__internal__/presetUtils.js';
 
-const client = new PrismaClient();
+export const client = new PrismaClient({
+  datasources: {
+    db: {url: import.meta.env['DATABASE_URL']},
+  },
+});
+
 export const userSeed = {
-  clean: () => client.user.deleteMany().then(),
-  createUser(email = `email-${crypto.randomUUID()}@example.it`) {
+  clean: async () => await client.user.deleteMany(),
+  async createUser(email?: string) {
+    const id = crypto.randomUUID();
     return client.user.create({
       data: {
-        email: email,
+        id,
+        email: email || `email-${id}@example.it`,
       },
     });
   },
 };
 
 export const presetSeed = {
-  clean: () => client.preset.deleteMany().then(),
-  createPresetV1(presetName: string, ownerId: string, data?: object) {
+  clean: async () => await client.preset.deleteMany(),
+  async createPresetV1(presetName: string, ownerId: string, data?: object) {
     return client.preset.create({
       data: {
         name: presetName,
@@ -28,9 +35,14 @@ export const presetSeed = {
   },
 };
 
+export const clearAllSeeds = async () => {
+  await projectSeed.clean();
+  await presetSeed.clean();
+  await userSeed.clean();
+};
 export const projectSeed = {
-  clean: () => client.project.deleteMany().then(),
-  createProject(projectName: string, ownerId: string) {
+  clean: async () => await client.project.deleteMany(),
+  async createProject(projectName: string, ownerId: string) {
     return client.project.create({
       data: {
         name: projectName,
@@ -51,7 +63,9 @@ export const projectSeed = {
             themeId: 'themeId',
           },
         },
-        owner: {connect: {id: ownerId}},
+        owner: {
+          connect: {id: ownerId},
+        },
       },
       include: {
         owner: true,

Diff for: apps/api/test/helper.ts

@@ -1,11 +1,11 @@
 import {User} from '@codeimage/prisma-models';
 import * as sinon from 'sinon';
-import {afterEach, assert, beforeAll, beforeEach, test} from 'vitest';
+import {afterEach, assert, beforeEach, test} from 'vitest';
 import {PresetCreateDto} from '../../../../src/modules/preset/schema/preset-create-dto.schema.js';
 import {PresetDto} from '../../../../src/modules/preset/schema/preset-dto.schema.js';
 import {testPresetUtils} from '../../../__internal__/presetUtils.js';
 import {build} from '../../../helper.js';
-import {userSeed} from '../../../helpers/seed.js';
+import {clearAllSeeds, userSeed} from '../../../helpers/seed.js';
 
 interface TestContext {
   user: User;
@@ -18,7 +18,7 @@ beforeEach<TestContext>(async context => {
 });
 
 afterEach(async () => {
-  await userSeed.clean();
+  await clearAllSeeds();
 });
 
 test<TestContext>('POST /v1/preset [Create Preset] -> 200', async t => {

Diff for: apps/api/test/helpers/seed.ts

@@ -1,17 +1,14 @@
 import {Preset, User} from '@codeimage/prisma-models';
-import * as sinon from 'sinon';
-import {afterEach, assert, beforeEach, test} from 'vitest';
+import {afterEach, assert, beforeEach, expect, test, vi} from 'vitest';
 
 import {build} from '../../../helper.js';
-import {presetSeed, userSeed} from '../../../helpers/seed.js';
+import {clearAllSeeds, presetSeed, userSeed} from '../../../helpers/seed.js';
 
 interface TestContext {
   user: User;
   preset1: Preset;
 }
 
-beforeEach(() => sinon.restore());
-
 beforeEach<TestContext>(async context => {
   const user = await userSeed.createUser();
   const preset1 = await presetSeed.createPresetV1('preset-1', user.id);
@@ -20,20 +17,20 @@ beforeEach<TestContext>(async context => {
 });
 
 afterEach(async () => {
-  await Promise.all([userSeed.clean(), presetSeed.clean()]);
+  await clearAllSeeds();
 });
 
 test<TestContext>('DELETE /v1/project/:id [Delete Project] -> 200', async t => {
   const fastify = await build(t);
   const userId = t.user.id;
   const presetId = t.preset1.id;
-  const spy = sinon.spy(fastify.presetService, 'deletePreset');
+  const spy = vi.spyOn(fastify.presetService, 'deletePreset');
 
   const response = await fastify.inject({
     url: `/api/v1/preset/${presetId}`,
     method: 'DELETE',
   });
 
   assert.equal(response.statusCode, 200, 'return status 200');
-  assert.ok(spy.withArgs(userId, presetId).calledOnce, 'has been called once');
+  expect(spy).toHaveBeenCalledWith(userId, presetId);
 });