diff --git a/packages/plugin-common/tests/handler.spec.ts b/packages/plugin-common/tests/handler.spec.ts index f2e7f0481f..156a6bad9a 100644 --- a/packages/plugin-common/tests/handler.spec.ts +++ b/packages/plugin-common/tests/handler.spec.ts @@ -19,13 +19,13 @@ describe('type: undefined', () => { }) test('group add', async () => { - app.receiveGroupRequest(321, 'add') + app.receiveGroupRequest('add', 321) await sleep(0) app.shouldHaveNoRequests() }) test('group invite', async () => { - app.receiveGroupRequest(321, 'invite') + app.receiveGroupRequest('invite', 321) await sleep(0) app.shouldHaveNoRequests() }) @@ -49,13 +49,13 @@ describe('type: string', () => { }) test('group add', async () => { - app.receiveGroupRequest(321, 'add') + app.receiveGroupRequest('add', 321) await sleep(0) app.shouldHaveLastRequest('set_group_add_request', { approve: false, reason: 'bar' }) }) test('group invite', async () => { - app.receiveGroupRequest(321, 'invite') + app.receiveGroupRequest('invite', 321) await sleep(0) app.shouldHaveLastRequest('set_group_add_request', { approve: false, reason: 'baz' }) }) @@ -79,13 +79,13 @@ describe('type: boolean', () => { }) test('group add', async () => { - app.receiveGroupRequest(321, 'add') + app.receiveGroupRequest('add', 321) await sleep(0) app.shouldHaveLastRequest('set_group_add_request', { approve: false }) }) test('group invite', async () => { - app.receiveGroupRequest(321, 'invite') + app.receiveGroupRequest('invite', 321) await sleep(0) app.shouldHaveLastRequest('set_group_add_request', { approve: false }) }) @@ -109,13 +109,13 @@ describe('type: function', () => { }) test('group add', async () => { - app.receiveGroupRequest(321, 'add') + app.receiveGroupRequest('add', 321) await sleep(0) app.shouldHaveLastRequest('set_group_add_request', { approve: true }) }) test('group invite', async () => { - app.receiveGroupRequest(321, 'invite') + app.receiveGroupRequest('invite', 321) await sleep(0) app.shouldHaveLastRequest('set_group_add_request', { approve: true }) }) diff --git a/packages/test-utils/src/app.ts b/packages/test-utils/src/app.ts index c53f7fce04..e49b803fbc 100644 --- a/packages/test-utils/src/app.ts +++ b/packages/test-utils/src/app.ts @@ -52,7 +52,7 @@ export class MockedApp extends App { this.receive({ postType: 'request', requestType: 'friend', userId, flag }) } - receiveGroupRequest (userId: number, subType: 'add' | 'invite', groupId = 10000, flag = 'flag') { + receiveGroupRequest (subType: 'add' | 'invite', userId: number, groupId = 10000, flag = 'flag') { this.receive({ postType: 'request', requestType: 'group', subType, userId, groupId, flag }) } diff --git a/packages/test-utils/tests/app.spec.ts b/packages/test-utils/tests/app.spec.ts index 149e4da367..17793d4537 100644 --- a/packages/test-utils/tests/app.spec.ts +++ b/packages/test-utils/tests/app.spec.ts @@ -66,7 +66,7 @@ describe('Receiver', () => { test('receiveGroupRequest', async () => { const mock = jest.fn() app.receiver.on('request/group/add', mock) - app.receiveGroupRequest(123, 'add') + app.receiveGroupRequest('add', 123) expect(mock).toBeCalledTimes(1) expect(mock).toBeCalledWith({ $approve: expect.anything(),