yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 23:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix user controller tests

Browse Source
This commit is contained in:
Convly 2020-06-04 10:48:02 +02:00 committed by Alexandre Bodin
parent d69101427f
commit 598e9b9d93
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/strapi-admin/controllers/__tests__/user.test.js
View File

@ -102,9 +102,9 @@ describe('User Controller', () => {
test('User not found', async () => {
const fakeId = 42;
const badRequest = jest.fn();
const notFound = jest.fn();
const findOne = jest.fn(() => Promise.resolve(null));
const ctx = createContext({ params: { id: fakeId } }, { badRequest });
const ctx = createContext({ params: { id: fakeId } }, { notFound });
global.strapi = {
admin: {
@ -117,7 +117,7 @@ describe('User Controller', () => {
await userController.findOne(ctx);
expect(findOne).toHaveBeenCalledWith({ id: fakeId });
expect(badRequest).toHaveBeenCalledWith('User does not exist');
expect(notFound).toHaveBeenCalledWith('User does not exist');
});
});
@ -201,7 +201,7 @@ describe('User Controller', () => {
test('User not found', async () => {
const fakeId = 42;
const exists = jest.fn(() => false);
const update = jest.fn(() => null);
const notFound = jest.fn();
const body = { username: 'Foo' };
@ -210,15 +210,14 @@ describe('User Controller', () => {
global.strapi = {
admin: {
services: {
user: { exists },
user: { update },
},
},
};
await userController.update(ctx);
expect(exists).toHaveBeenCalledWith({ id: fakeId });
expect(exists).toHaveReturnedWith(false);
expect(update).toHaveReturnedWith(null);
expect(notFound).toHaveBeenCalledWith('User does not exist');
});
@ -236,7 +235,6 @@ describe('User Controller', () => {
});
test('Update a user correctly', async () => {
const exists = jest.fn(() => true);
const update = jest.fn((_, input) => ({ ...user, ...input }));
const sanitizeUser = jest.fn(user => user);
const body = { firstname: 'Foo' };
@ -246,15 +244,13 @@ describe('User Controller', () => {
global.strapi = {
admin: {
services: {
user: { update, sanitizeUser, exists },
user: { update, sanitizeUser },
},
},
};
await userController.update(ctx);
expect(exists).toHaveBeenCalledWith({ id: user.id });
expect(exists).toHaveReturnedWith(true);
expect(update).toHaveBeenCalledWith({ id: user.id }, body);
expect(sanitizeUser).toHaveBeenCalled();
expect(ctx.body).toStrictEqual({ data: { ...user, ...body } });

2
packages/strapi-admin/controllers/user.js
View File

@ -71,7 +71,7 @@ module.exports = {
const updatedUser = await strapi.admin.services.user.update({ id }, input);
if (!updatedUser) {
return ctx.badRequest('User does not exist');
return ctx.notFound('User does not exist');
}
ctx.body = {