fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 14:39:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-04-15 01:07:35 +00:00
commit eaef54083d
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/plugins/@nocobase/plugin-departments/src/server/__tests__/actions.test.ts
View File

@ -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');

13
packages/plugins/@nocobase/plugin-departments/src/server/__tests__/data-sync.test.ts
View File

@ -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,
},

2
packages/plugins/@nocobase/plugin-departments/src/server/__tests__/destroy-department-check.test.ts
View File

@ -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');

2
packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-department-owners.test.ts
View File

@ -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');

2
packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-departments-info.test.ts
View File

@ -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');

2
packages/plugins/@nocobase/plugin-departments/src/server/__tests__/set-main-department.test.ts
View File

@ -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');

2
packages/plugins/@nocobase/plugin-departments/src/server/__tests__/update-department-is-leaf.test.ts
View File

@ -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');