diff --git a/server/api/__snapshots__/auth.test.js.snap b/server/api/__snapshots__/auth.test.js.snap index c132cff7..716f58eb 100644 --- a/server/api/__snapshots__/auth.test.js.snap +++ b/server/api/__snapshots__/auth.test.js.snap @@ -1,3 +1,42 @@ +exports[`#auth.login should login with email 1`] = ` +Object { + "avatarUrl": "http://example.com/avatar.png", + "id": "86fde1d4-0050-428f-9f0b-0bf77f8bdf61", + "name": "User 1", + "username": "user1" +} +`; + +exports[`#auth.login should login with username 1`] = ` +Object { + "avatarUrl": "http://example.com/avatar.png", + "id": "86fde1d4-0050-428f-9f0b-0bf77f8bdf61", + "name": "User 1", + "username": "user1" +} +`; + +exports[`#auth.login should require either username or email 1`] = ` +Object { + "error": "username or email is required", + "ok": false +} +`; + +exports[`#auth.login should require password 1`] = ` +Object { + "error": "password is required", + "ok": false +} +`; + +exports[`#auth.login should validate password 1`] = ` +Object { + "error": "Invalid password", + "ok": false +} +`; + exports[`#auth.signup should require params 1`] = ` Object { "error": "name is required", @@ -25,42 +64,3 @@ Object { "ok": false } `; - -exports[`#login should login with email 1`] = ` -Object { - "avatarUrl": "http://example.com/avatar.png", - "id": "86fde1d4-0050-428f-9f0b-0bf77f8bdf61", - "name": "User 1", - "username": "user1" -} -`; - -exports[`#login should login with username 1`] = ` -Object { - "avatarUrl": "http://example.com/avatar.png", - "id": "86fde1d4-0050-428f-9f0b-0bf77f8bdf61", - "name": "User 1", - "username": "user1" -} -`; - -exports[`#login should require either username or email 1`] = ` -Object { - "error": "username or email is required", - "ok": false -} -`; - -exports[`#login should require password 1`] = ` -Object { - "error": "password is required", - "ok": false -} -`; - -exports[`#login should validate password 1`] = ` -Object { - "error": "Invalid password", - "ok": false -} -`; diff --git a/server/api/__snapshots__/user.test.js.snap b/server/api/__snapshots__/user.test.js.snap index 5406bc5d..1fd03052 100644 --- a/server/api/__snapshots__/user.test.js.snap +++ b/server/api/__snapshots__/user.test.js.snap @@ -1,11 +1,11 @@ -exports[`test should require authentication 1`] = ` +exports[`#user.info should require authentication 1`] = ` Object { "error": "Authentication required", "ok": false } `; -exports[`test should return known user 1`] = ` +exports[`#user.info should return known user 1`] = ` Object { "data": Object { "avatarUrl": "http://example.com/avatar.png", diff --git a/server/api/auth.test.js b/server/api/auth.test.js index 283a9232..fec61a64 100644 --- a/server/api/auth.test.js +++ b/server/api/auth.test.js @@ -86,7 +86,7 @@ describe('#auth.signup', async () => { }); }); -describe('#login', () => { +describe('#auth.login', () => { test('should login with email', async () => { await seed(); const res = await server.post('/api/auth.login', { diff --git a/server/api/user.test.js b/server/api/user.test.js index 3768321b..3c707582 100644 --- a/server/api/user.test.js +++ b/server/api/user.test.js @@ -11,28 +11,30 @@ beforeEach(flushdb); afterAll(() => server.close()); afterAll(() => sequelize.close()); -it('should return known user', async () => { - await seed(); - const user = await User.findOne({ - where: { - email: 'user1@example.com', - }, +describe('#user.info', async () => { + it('should return known user', async () => { + await seed(); + const user = await User.findOne({ + where: { + email: 'user1@example.com', + }, + }); + + const res = await server.post('/api/user.info', { + body: { token: user.getJwtToken() }, + }); + const body = await res.json(); + + expect(res.status).toEqual(200); + expect(body).toMatchSnapshot(); }); - const res = await server.post('/api/user.info', { - body: { token: user.getJwtToken() }, + it('should require authentication', async () => { + await seed(); + const res = await server.post('/api/user.info'); + const body = await res.json(); + + expect(res.status).toEqual(401); + expect(body).toMatchSnapshot(); }); - const body = await res.json(); - - expect(res.status).toEqual(200); - expect(body).toMatchSnapshot(); -}); - -it('should require authentication', async () => { - await seed(); - const res = await server.post('/api/user.info'); - const body = await res.json(); - - expect(res.status).toEqual(401); - expect(body).toMatchSnapshot(); });