fix: rebase error

toeverything · Dec 9, 2024 · 5691769 · 5691769
1 parent dd6d8d9
commit 5691769
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "docs/reference",
     "tools/@types/*",
     "tests/*",
+    "tests/affine-cloud/*",
     "tests/affine-legacy/*"
   ],
   "engines": {

diff --git a/packages/backend/server/tests/copilot-provider.e2e.ts b/packages/backend/server/tests/copilot-provider.e2e.ts
@@ -88,6 +88,7 @@ test.before(async t => {
 });
 
 test.after(async t => {
+  if (!isCopilotConfigured) return;
   await runPrisma(async client => {
     await client.user.delete({
       where: {

diff --git a/tests/kit/utils/cloud.ts b/tests/kit/utils/cloud.ts
@@ -160,7 +160,7 @@ export async function createRandomAIUser(
 }> {
   const user = {
     name: faker.internet.username(),
-    email: faker.internet.email().toLowerCase(),
+    email: faker.internet.email({ provider }).toLowerCase(),
     password: '123456',
   };
   const result = await connector(async client => {

diff --git a/yarn.lock b/yarn.lock
@@ -67,6 +67,26 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@affine-test/affine-cloud-copilot@workspace:tests/affine-cloud/copilot":
+  version: 0.0.0-use.local
+  resolution: "@affine-test/affine-cloud-copilot@workspace:tests/affine-cloud/copilot"
+  dependencies:
+    "@affine-test/kit": "workspace:*"
+    "@affine/server": "workspace:*"
+    "@playwright/test": "npm:=1.49.0"
+    ava: "npm:^6.1.2"
+  languageName: unknown
+  linkType: soft
+
+"@affine-test/affine-cloud@workspace:tests/affine-cloud/cloud":
+  version: 0.0.0-use.local
+  resolution: "@affine-test/affine-cloud@workspace:tests/affine-cloud/cloud"
+  dependencies:
+    "@affine-test/kit": "workspace:*"
+    "@playwright/test": "npm:=1.49.0"
+  languageName: unknown
+  linkType: soft
+
 "@affine-test/affine-desktop-cloud@workspace:tests/affine-desktop-cloud":
   version: 0.0.0-use.local
   resolution: "@affine-test/affine-desktop-cloud@workspace:tests/affine-desktop-cloud"
@@ -744,7 +764,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: