feat: move api e2e to tests package

toeverything · Nov 8, 2024 · 476b91f · 476b91f
1 parent c25217e
commit 476b91f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/.github/actions/copilot-test/action.yml b/.github/actions/copilot-test/action.yml
@@ -3,7 +3,7 @@ description: 'Run Copilot E2E Test'
 inputs:
   script:
     description: 'Script to run'
-    default: 'yarn workspace @affine-test/affine-cloud-copilot e2e --forbid-only'
+    default: 'yarn workspace @affine-test/affine-cloud-copilot test:e2e --forbid-only'
     required: false
   openai-key:
     description: 'OpenAI secret key'

diff --git a/.github/workflows/copilot-test.yml b/.github/workflows/copilot-test.yml
@@ -45,7 +45,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        type: [e2e, spec]
+        spec:
+          - {
+              name: e2e,
+              package: '@affine-test/affine-cloud-copilot',
+              type: e2e,
+            }
+          - { name: spec, package: '@affine/server', type: copilot:spec }
     services:
       postgres:
         image: postgres
@@ -82,8 +88,8 @@ jobs:
       - name: Prepare Server Test Environment
         uses: ./.github/actions/server-test-env
 
-      - name: Run copilot api ${{ matrix.type }} tests
-        run: yarn workspace @affine/server test:copilot:${{ matrix.type }}:coverage --forbid-only
+      - name: Run copilot api ${{ matrix.name }} tests
+        run: yarn workspace ${{ matrix.spec.package }} test:${{ matrix.spec.type }}:coverage --forbid-only
         env:
           CARGO_TARGET_DIR: '${{ github.workspace }}/target'
           COPILOT_OPENAI_API_KEY: ${{ secrets.COPILOT_OPENAI_API_KEY }}
@@ -147,7 +153,7 @@ jobs:
       - name: Run Copilot E2E Test ${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
         uses: ./.github/actions/copilot-test
         with:
-          script: yarn workspace @affine-test/affine-cloud-copilot e2e --forbid-only --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+          script: yarn workspace @affine-test/affine-cloud-copilot test:e2e --forbid-only --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
           openai-key: ${{ secrets.COPILOT_OPENAI_API_KEY }}
           fal-key: ${{ secrets.COPILOT_FAL_API_KEY }}
 

diff --git a/packages/backend/server/package.json b/packages/backend/server/package.json
@@ -12,10 +12,8 @@
     "start": "node --loader ts-node/esm/transpile-only.mjs ./src/index.ts",
     "dev": "nodemon ./src/index.ts",
     "test": "ava --concurrency 1 --serial",
-    "test:copilot:e2e": "ava \"tests/**/copilot-*.e2e.ts\"",
     "test:copilot:spec": "ava \"tests/**/copilot-*.spec.ts\"",
     "test:coverage": "c8 ava --concurrency 1 --serial",
-    "test:copilot:e2e:coverage": "c8 ava --timeout=5m \"tests/**/copilot-*.e2e.ts\"",
     "test:copilot:spec:coverage": "c8 ava --timeout=5m \"tests/**/copilot-*.spec.ts\"",
     "postinstall": "prisma generate",
     "data-migration": "node --loader ts-node/esm/transpile-only.mjs ./src/data/index.ts",

diff --git a/...kend/server/tests/copilot-provider.e2e.ts → ...s/affine-cloud-copilot/e2e/copilot.e2e.ts b/...kend/server/tests/copilot-provider.e2e.ts → ...s/affine-cloud-copilot/e2e/copilot.e2e.ts
@@ -1,12 +1,6 @@
-/// <reference types="../src/global.d.ts" />
-
 import { randomUUID } from 'node:crypto';
 
-import { INestApplication } from '@nestjs/common';
-import type { ExecutionContext, TestFn } from 'ava';
-import ava from 'ava';
-
-import { automaticSignIn, createWorkspace } from './utils';
+import { automaticSignIn, createWorkspace } from '@affine/server/tests/utils';
 import {
   chatWithImages,
   chatWithText,
@@ -16,10 +10,12 @@ import {
   ProviderActionTestCase,
   ProviderWorkflowTestCase,
   sse2array,
-} from './utils/copilot';
+} from '@affine/server/tests/utils/copilot';
+import type { ExecutionContext, TestFn } from 'ava';
+import ava from 'ava';
 
 type Tester = {
-  app: INestApplication<any>;
+  app: any;
   userToken: string;
   workspaceId: string;
 };
@@ -54,7 +50,7 @@ const runIfCopilotConfigured = test.macro(
 test.before(async t => {
   if (!isCopilotConfigured) return;
   const { endpoint, user, password, secret } = e2eConfig;
-  const app = { getHttpServer: () => endpoint } as INestApplication<any>;
+  const app = { getHttpServer: () => endpoint } as any;
   const token = await automaticSignIn(app, user, password, secret);
   const { id } = await createWorkspace(app, token);
 

diff --git a/tests/affine-cloud-copilot/package.json b/tests/affine-cloud-copilot/package.json
@@ -2,11 +2,15 @@
   "name": "@affine-test/affine-cloud-copilot",
   "private": true,
   "scripts": {
-    "e2e": "yarn playwright test"
+    "test:e2e": "yarn playwright test",
+    "test:api": "ava \"tests/**/copilot-*.e2e.ts\"",
+    "test:api:coverage": "c8 ava --timeout=5m \"tests/**/copilot-*.e2e.ts\""
   },
   "devDependencies": {
     "@affine-test/kit": "workspace:*",
-    "@playwright/test": "=1.48.2"
+    "@affine/server": "workspace:*",
+    "@playwright/test": "=1.48.2",
+    "ava": "^6.1.2"
   },
   "version": "0.17.0"
 }
diff --git a/yarn.lock b/yarn.lock
@@ -72,7 +72,9 @@ __metadata:
   resolution: "@affine-test/affine-cloud-copilot@workspace:tests/affine-cloud-copilot"
   dependencies:
     "@affine-test/kit": "workspace:*"
+    "@affine/server": "workspace:*"
     "@playwright/test": "npm:=1.48.2"
+    ava: "npm:^6.1.2"
   languageName: unknown
   linkType: soft
 
@@ -746,7 +748,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@affine/server@workspace:packages/backend/server":
+"@affine/server@workspace:*, @affine/server@workspace:packages/backend/server":
   version: 0.0.0-use.local
   resolution: "@affine/server@workspace:packages/backend/server"
   dependencies: