diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts index 8b4cd926da..1cc536139b 100644 --- a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts +++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts @@ -27,7 +27,7 @@ describe('actions', () => { beforeAll(async () => { app = await createMockServer({ - plugins: ['users', 'departments'], + plugins: ['field-sort', 'users', 'departments'], }); db = app.db; repo = db.getRepository('departments'); diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts index 64e73eb978..0471a66632 100644 --- a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts +++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts @@ -7,9 +7,8 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import { UserDataResourceManager } from '@nocobase/plugin-user-data-sync'; +import PluginUserDataSyncServer, { UserDataResourceManager } from '@nocobase/plugin-user-data-sync'; import { MockDatabase, MockServer, createMockServer } from '@nocobase/test'; -import PluginUserDataSyncServer from '@nocobase/plugin-user-data-sync'; describe('department data sync', async () => { let app: MockServer; @@ -18,7 +17,7 @@ describe('department data sync', async () => { beforeEach(async () => { app = await createMockServer({ - plugins: ['user-data-sync', 'users', 'departments'], + plugins: ['field-sort', 'user-data-sync', 'users', 'departments'], }); db = app.db; const plugin = app.pm.get('user-data-sync') as PluginUserDataSyncServer; @@ -259,18 +258,16 @@ describe('department data sync', async () => { expect(department.customField).toBe('testField'); await resourceManager.updateOrCreate({ sourceName: 'test', - dataType: 'user', - matchKey: 'email', + dataType: 'department', records: [ { uid: '1', - nickname: 'test', - email: 'test@nocobase.com', + title: 'test', customField: 'testField2', }, ], }); - const department2 = await db.getRepository('users').findOne({ + const department2 = await db.getRepository('departments').findOne({ filter: { id: department.id, }, diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts index 02e85c4f02..80355b551e 100644 --- a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts +++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts @@ -27,7 +27,7 @@ describe('destroy department check', () => { beforeAll(async () => { app = await createMockServer({ - plugins: ['users', 'departments'], + plugins: ['field-sort', 'users', 'departments'], }); db = app.db; repo = db.getRepository('departments'); diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts index 047b024708..7775b6e873 100644 --- a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts +++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts @@ -27,7 +27,7 @@ describe('set department owners', () => { beforeAll(async () => { app = await createMockServer({ - plugins: ['users', 'departments'], + plugins: ['field-sort', 'users', 'departments'], }); db = app.db; repo = db.getRepository('departments'); diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts index 987d77c938..b6417fbefa 100644 --- a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts +++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts @@ -29,7 +29,7 @@ describe('set departments info', () => { beforeAll(async () => { app = await createMockServer({ - plugins: ['users', 'departments', 'acl', 'data-source-manager'], + plugins: ['field-sort', 'users', 'departments', 'acl', 'data-source-manager'], }); db = app.db; repo = db.getRepository('departments'); diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts index c65750f36b..46a5b9d310 100644 --- a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts +++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts @@ -27,7 +27,7 @@ describe('set main department', () => { beforeAll(async () => { app = await createMockServer({ - plugins: ['users', 'departments'], + plugins: ['field-sort', 'users', 'departments'], }); db = app.db; repo = db.getRepository('departments'); diff --git a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts index 71c91b39b9..3f3803c485 100644 --- a/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts +++ b/packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts @@ -27,7 +27,7 @@ describe('update department isLeaf', () => { beforeAll(async () => { app = await createMockServer({ - plugins: ['users', 'departments'], + plugins: ['field-sort', 'users', 'departments'], }); db = app.db; repo = db.getRepository('departments');