diff --git a/packages/core/auth/package.json b/packages/core/auth/package.json index af0e356596..66d63118eb 100644 --- a/packages/core/auth/package.json +++ b/packages/core/auth/package.json @@ -10,6 +10,7 @@ "@nocobase/cache": "1.4.0-alpha", "@nocobase/database": "1.4.0-alpha", "@nocobase/resourcer": "1.4.0-alpha", + "@nocobase/test": "1.4.0-alpha", "@nocobase/utils": "1.4.0-alpha", "@types/jsonwebtoken": "^8.5.8", "jsonwebtoken": "^8.5.1" diff --git a/packages/core/auth/src/__tests__/middleware.test.ts b/packages/core/auth/src/__tests__/middleware.test.ts index 3f7333f07c..b1962a5cec 100644 --- a/packages/core/auth/src/__tests__/middleware.test.ts +++ b/packages/core/auth/src/__tests__/middleware.test.ts @@ -8,7 +8,7 @@ */ import { Database } from '@nocobase/database'; -import { MockServer, mockServer } from '@nocobase/test'; +import { MockServer, createMockServer } from '@nocobase/test'; import { vi } from 'vitest'; describe('middleware', () => { @@ -17,14 +17,13 @@ describe('middleware', () => { let agent; beforeEach(async () => { - app = mockServer({ + app = await createMockServer({ registerActions: true, acl: true, plugins: ['users', 'auth', 'acl', 'data-source-manager'], }); // app.plugin(ApiKeysPlugin); - await app.loadAndInstall({ clean: true }); db = app.db; agent = app.agent(); }); diff --git a/packages/core/lock-manager/src/lock-manager.ts b/packages/core/lock-manager/src/lock-manager.ts index de9d64d72a..a7cf844113 100644 --- a/packages/core/lock-manager/src/lock-manager.ts +++ b/packages/core/lock-manager/src/lock-manager.ts @@ -150,7 +150,7 @@ export class LockManager { } } - public async acquire(key: string, ttl = 500) { + public async acquire(key: string, ttl = 500): Promise { const client = await this.getAdapter(); return client.acquire(key, ttl); } diff --git a/packages/core/test/src/server/mock-server.ts b/packages/core/test/src/server/mock-server.ts index 966504bc01..d5bf1978a2 100644 --- a/packages/core/test/src/server/mock-server.ts +++ b/packages/core/test/src/server/mock-server.ts @@ -325,7 +325,7 @@ export async function createMockCluster({ }; } -export async function createMockServer(options: MockServerOptions = {}) { +export async function createMockServer(options: MockServerOptions = {}): Promise { const { version, beforeInstall, skipInstall, skipStart, ...others } = options; const app: MockServer = mockServer(others); if (!skipInstall) {