diff --git a/package-lock.json b/package-lock.json index efa2a76..e353a9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,9 @@ "version": "1.0.0", "license": "MIT", "dependencies": { + "@faker-js/faker": "9.7.0", "async-retry": "1.3.3", - "bcryptjs": "^3.0.2", + "bcryptjs": "3.0.2", "dotenv": "16.5.0", "dotenv-expand": "12.0.2", "next": "15.3.1", @@ -1006,6 +1007,22 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@faker-js/faker": { + "version": "9.7.0", + "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.7.0.tgz", + "integrity": "sha512-aozo5vqjCmDoXLNUJarFZx2IN/GgGaogY4TMJ6so/WLZOWpSV7fvj2dmrV6sEAnUm1O7aCrhTibjpzeDFgNqbg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/fakerjs" + } + ], + "license": "MIT", + "engines": { + "node": ">=18.0.0", + "npm": ">=9.0.0" + } + }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", diff --git a/package.json b/package.json index 7c9190b..bd5ac1e 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "author": "Diego Santos Dev", "license": "MIT", "dependencies": { + "@faker-js/faker": "9.7.0", "async-retry": "1.3.3", "bcryptjs": "3.0.2", "dotenv": "16.5.0", diff --git a/tests/integration/api/v1/users/[username]/get.test.js b/tests/integration/api/v1/users/[username]/get.test.js index fb60fa7..5e7b413 100644 --- a/tests/integration/api/v1/users/[username]/get.test.js +++ b/tests/integration/api/v1/users/[username]/get.test.js @@ -10,69 +10,51 @@ beforeAll(async () => { describe("GET api/v1/users/[username]", () => { describe("Anonymous user", () => { test("With exact case match", async () => { - const response1 = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "MesmoCase", - email: "mesmo.case@teste.com.br", - password: "123abc", - }), + const createdUser = await orchestrator.createUser({ + username: "MesmoCase", }); - expect(response1.status).toBe(201); - const response2 = await fetch( + const response = await fetch( "http://localhost:3000/api/v1/users/MesmoCase", ); - expect(response2.status).toBe(200); + expect(response.status).toBe(200); - const response2Body = await response2.json(); - expect(response2Body).toEqual({ - id: response2Body.id, + const responseBody = await response.json(); + expect(responseBody).toEqual({ + id: responseBody.id, username: "MesmoCase", - email: "mesmo.case@teste.com.br", - password: response2Body.password, - created_at: response2Body.created_at, - updated_at: response2Body.updated_at, + email: createdUser.email, + password: responseBody.password, + created_at: responseBody.created_at, + updated_at: responseBody.updated_at, }); - expect(uuidVersion(response2Body.id)).toBe(4); - expect(Date.parse(response2Body.created_at)).not.toBeNaN(); - expect(Date.parse(response2Body.updated_at)).not.toBeNaN(); + expect(uuidVersion(responseBody.id)).toBe(4); + expect(Date.parse(responseBody.created_at)).not.toBeNaN(); + expect(Date.parse(responseBody.updated_at)).not.toBeNaN(); }); test("With case mismatch", async () => { - const response1 = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "CaseDiferente", - email: "case.diferente@teste.com.br", - password: "123abc", - }), + const createdUser = await orchestrator.createUser({ + username: "CaseDiferente", }); - expect(response1.status).toBe(201); - const response2 = await fetch( + const response = await fetch( "http://localhost:3000/api/v1/users/casediferente", ); - expect(response2.status).toBe(200); + expect(response.status).toBe(200); - const response2Body = await response2.json(); - expect(response2Body).toEqual({ - id: response2Body.id, + const responseBody = await response.json(); + expect(responseBody).toEqual({ + id: responseBody.id, username: "CaseDiferente", - email: "case.diferente@teste.com.br", - password: response2Body.password, - created_at: response2Body.created_at, - updated_at: response2Body.updated_at, + email: createdUser.email, + password: responseBody.password, + created_at: responseBody.created_at, + updated_at: responseBody.updated_at, }); - expect(uuidVersion(response2Body.id)).toBe(4); - expect(Date.parse(response2Body.created_at)).not.toBeNaN(); - expect(Date.parse(response2Body.updated_at)).not.toBeNaN(); + expect(uuidVersion(responseBody.id)).toBe(4); + expect(Date.parse(responseBody.created_at)).not.toBeNaN(); + expect(Date.parse(responseBody.updated_at)).not.toBeNaN(); }); test("With nonexistent username", async () => { diff --git a/tests/integration/api/v1/users/[username]/patch.test.js b/tests/integration/api/v1/users/[username]/patch.test.js index 7f779dd..45ea4b8 100644 --- a/tests/integration/api/v1/users/[username]/patch.test.js +++ b/tests/integration/api/v1/users/[username]/patch.test.js @@ -30,31 +30,15 @@ describe("GET api/v1/users/[username]", () => { }); test("With duplicated 'username'", async () => { - const user1Response = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "user1", - email: "user1@teste.com.br", - password: "123abc", - }), + await orchestrator.createUser({ + username: "user1", + email: "user1@teste.com.br", }); - expect(user1Response.status).toBe(201); - const user2Response = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "user2", - email: "user2@teste.com.br", - password: "123abc", - }), + await orchestrator.createUser({ + username: "user2", + email: "user2@teste.com.br", }); - expect(user2Response.status).toBe(201); const response = await fetch("http://localhost:3000/api/v1/users/user2", { method: "PATCH", @@ -77,34 +61,16 @@ describe("GET api/v1/users/[username]", () => { }); test("With duplicated 'email'", async () => { - const user1Response = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "email1", - email: "email1@teste.com.br", - password: "123abc", - }), + await orchestrator.createUser({ + email: "email1@teste.com.br", }); - expect(user1Response.status).toBe(201); - const user2Response = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "email2", - email: "email2@teste.com.br", - password: "123abc", - }), + const createdUser = await orchestrator.createUser({ + email: "email2@teste.com.br", }); - expect(user2Response.status).toBe(201); const response = await fetch( - "http://localhost:3000/api/v1/users/email2", + `http://localhost:3000/api/v1/users/${createdUser.username}`, { method: "PATCH", headers: { @@ -127,18 +93,9 @@ describe("GET api/v1/users/[username]", () => { }); test("With unique 'username'", async () => { - const user1Response = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "uniqueUser1", - email: "uniqueUser1@teste.com.br", - password: "123abc", - }), + const createdUser = await orchestrator.createUser({ + username: "uniqueUser1", }); - expect(user1Response.status).toBe(201); const response = await fetch( "http://localhost:3000/api/v1/users/uniqueUser1", @@ -158,7 +115,7 @@ describe("GET api/v1/users/[username]", () => { expect(responseBody).toEqual({ id: responseBody.id, username: "uniqueUser2", - email: "uniqueUser1@teste.com.br", + email: createdUser.email, password: responseBody.password, created_at: responseBody.created_at, updated_at: responseBody.updated_at, @@ -170,21 +127,11 @@ describe("GET api/v1/users/[username]", () => { }); test("With unique 'email'", async () => { - const user1Response = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "uniqueEmail1", - email: "uniqueEmail1@teste.com.br", - password: "123abc", - }), + const createdUser = await orchestrator.createUser({ + email: "uniqueEmail1@teste.com.br", }); - expect(user1Response.status).toBe(201); - const response = await fetch( - "http://localhost:3000/api/v1/users/uniqueEmail1", + `http://localhost:3000/api/v1/users/${createdUser.username}`, { method: "PATCH", headers: { @@ -200,7 +147,7 @@ describe("GET api/v1/users/[username]", () => { const responseBody = await response.json(); expect(responseBody).toEqual({ id: responseBody.id, - username: "uniqueEmail1", + username: createdUser.username, email: "uniqueEmail2@teste.com.br", password: responseBody.password, created_at: responseBody.created_at, @@ -213,21 +160,12 @@ describe("GET api/v1/users/[username]", () => { }); test("With new 'password'", async () => { - const user1Response = await fetch("http://localhost:3000/api/v1/users", { - method: "POST", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ - username: "newPassword1", - email: "newPassword1@teste.com.br", - password: "newPassword1", - }), + const createdUser = await orchestrator.createUser({ + password: "newPassword1", }); - expect(user1Response.status).toBe(201); const response = await fetch( - "http://localhost:3000/api/v1/users/newPassword1", + `http://localhost:3000/api/v1/users/${createdUser.username}`, { method: "PATCH", headers: { @@ -243,8 +181,8 @@ describe("GET api/v1/users/[username]", () => { const responseBody = await response.json(); expect(responseBody).toEqual({ id: responseBody.id, - username: "newPassword1", - email: "newPassword1@teste.com.br", + username: createdUser.username, + email: createdUser.email, password: responseBody.password, created_at: responseBody.created_at, updated_at: responseBody.updated_at, @@ -254,7 +192,7 @@ describe("GET api/v1/users/[username]", () => { expect(Date.parse(responseBody.updated_at)).not.toBeNaN(); expect(responseBody.updated_at > responseBody.created_at).toBe(true); - const userInDatabase = await user.findOneByUsername("newPassword1"); + const userInDatabase = await user.findOneByUsername(createdUser.username); const correctPasswordMatch = await password.compare( "newPassword2", userInDatabase.password, diff --git a/tests/orchestrator.js b/tests/orchestrator.js index 468d668..ba9e829 100644 --- a/tests/orchestrator.js +++ b/tests/orchestrator.js @@ -1,6 +1,9 @@ import retry from "async-retry"; +import { faker } from "@faker-js/faker"; + import database from "infra/database.js"; import migrator from "models/migrator.js"; +import user from "models/user"; async function waitForAllServices() { await waitForWebServer(); @@ -28,10 +31,20 @@ async function runPendingMigrations() { await migrator.runPendingMigrations(); } +async function createUser(userObject) { + return await user.create({ + username: + userObject.username || faker.internet.username().replace(/[_.-]/g, ""), + email: userObject.email || faker.internet.email(), + password: userObject.password || "validpassword", + }); +} + const orchestrator = { waitForAllServices, clearDatabase, runPendingMigrations, + createUser, }; export default orchestrator;