From 4294d5121b1296b24058fc3941b6bcbac3cfc93a Mon Sep 17 00:00:00 2001 From: KSohkin Date: Sat, 23 May 2026 19:45:10 +0300 Subject: [PATCH] Added changes, Mock Tests --- app.mock.test.js | 124 ++++++++++++++++++++++++--------- app.test.js | 100 ++++++++++++++++++-------- package-lock.json | 10 ++- validation/validatePassword.js | 8 ++- validation/validateUsername.js | 6 +- 5 files changed, 183 insertions(+), 65 deletions(-) diff --git a/app.mock.test.js b/app.mock.test.js index 79b9449..7736a32 100644 --- a/app.mock.test.js +++ b/app.mock.test.js @@ -3,57 +3,115 @@ const request = require('supertest') const validateUsername = require('./validation/validateUsername') const validatePassword = require('./validation/validatePassword') -//Mock validateEmail to isolate tests +// Mock email validation but still execute the real validator logic +// without the artificial 2-second delay, so the mocked run keeps 100% coverage. jest.mock('./validation/validateEmail', () => { + const actualValidateEmail = jest.requireActual('./validation/validateEmail') + return jest.fn((email) => { - //Simulate real world simulation - if (!email || typeof email !== 'string') return false; - const re = /^[^\s@]+@[^\s@]+\.[^\s@]{2,}$/i; - return re.test(email); + const originalDateNow = Date.now + + Date.now = jest.fn() + .mockReturnValueOnce(0) + .mockReturnValue(2001) + + try { + return actualValidateEmail(email) + } finally { + Date.now = originalDateNow + } }) }) const validateEmail = require('./validation/validateEmail') const app = createApp(validateUsername, validatePassword, validateEmail) -describe('given correct username and password', () => { - test('return status 200', async () => { +describe('POST /users', () => { + beforeEach(() => { + validateEmail.mockClear() + }) + + test('returns 200 and valid user payload for valid input', async () => { const response = await request(app).post('/users').send({ - username: 'Username', + username: 'User.Name123', password: 'Password123', email: 'student@example.com' }) + expect(response.statusCode).toBe(200) + expect(response.headers['content-type']).toMatch(/json/) + expect(response.body).toEqual({ + userId: '1', + message: 'Valid User' + }) }) - test('returns userId', async () => { - const response = await request(app).post('/users').send({ - username: 'Username', + test.each([ + ['username is shorter than 6 characters', { + username: 'user', password: 'Password123', email: 'student@example.com' - }) - expect(response.body.userId).toBeDefined(); - }) - - // test response content type? - // test response message - // test response user id value - // ... -}) + }], + ['username contains special characters', { + username: 'user!23', + password: 'Password123', + email: 'student@example.com' + }], + ['password is shorter than 8 characters', { + username: 'Valid.User', + password: 'Pass123', + email: 'student@example.com' + }], + ['password is missing an uppercase letter', { + username: 'Valid.User', + password: 'password123', + email: 'student@example.com' + }], + ['password is missing a lowercase letter', { + username: 'Valid.User', + password: 'PASSWORD123', + email: 'student@example.com' + }], + ['password is missing a number', { + username: 'Valid.User', + password: 'Password', + email: 'student@example.com' + }], + ['password contains special characters', { + username: 'Valid.User', + password: 'Password123!', + email: 'student@example.com' + }], + ['email is missing @', { + username: 'Valid.User', + password: 'Password123', + email: 'studentexample.com' + }], + ['email is missing a valid domain extension', { + username: 'Valid.User', + password: 'Password123', + email: 'student@example' + }], + ['username is missing', { + password: 'Password123', + email: 'student@example.com' + }], + ['password is missing', { + username: 'Valid.User', + email: 'student@example.com' + }], + ['email is missing', { + username: 'Valid.User', + password: 'Password123' + }] + ])('returns 400 and error payload when %s', async (_scenario, payload) => { + const response = await request(app).post('/users').send(payload) -describe('given incorrect or missing username and password', () => { - test('return status 400', async () => { - const response = await request(app).post('/users').send({ - username: 'user', - password: 'password', - email: 'not-an-email' - }) expect(response.statusCode).toBe(400) + expect(response.headers['content-type']).toMatch(/json/) + expect(response.body).toEqual({ + error: 'Invalid User' + }) + expect(response.body.userId).toBeUndefined() }) - - // test response message - // test that response does NOT have userId - // test incorrect username or password according to requirements - // test missing username or password - // ... }) \ No newline at end of file diff --git a/app.test.js b/app.test.js index f1b561d..3c2c559 100644 --- a/app.test.js +++ b/app.test.js @@ -6,44 +6,88 @@ const validateEmail = require('./validation/validateEmail') const app = createApp(validateUsername, validatePassword, validateEmail) -describe('given correct username and password', () => { - test('return status 200', async () => { +describe('POST /users', () => { + test('returns 200 and valid user payload for valid input', async () => { const response = await request(app).post('/users').send({ - username: 'Username', + username: 'User.Name123', password: 'Password123', email: 'student@example.com' }) + expect(response.statusCode).toBe(200) + expect(response.headers['content-type']).toMatch(/json/) + expect(response.body).toEqual({ + userId: '1', + message: 'Valid User' + }) }) - test('returns userId', async () => { - const response = await request(app).post('/users').send({ - username: 'Username', + test.each([ + ['username is shorter than 6 characters', { + username: 'user', password: 'Password123', email: 'student@example.com' - }) - expect(response.body.userId).toBeDefined(); - }) - - // test response content type? - // test response message - // test response user id value - // ... -}) + }], + ['username contains special characters', { + username: 'user!23', + password: 'Password123', + email: 'student@example.com' + }], + ['password is shorter than 8 characters', { + username: 'Valid.User', + password: 'Pass123', + email: 'student@example.com' + }], + ['password is missing an uppercase letter', { + username: 'Valid.User', + password: 'password123', + email: 'student@example.com' + }], + ['password is missing a lowercase letter', { + username: 'Valid.User', + password: 'PASSWORD123', + email: 'student@example.com' + }], + ['password is missing a number', { + username: 'Valid.User', + password: 'Password', + email: 'student@example.com' + }], + ['password contains special characters', { + username: 'Valid.User', + password: 'Password123!', + email: 'student@example.com' + }], + ['email is missing @', { + username: 'Valid.User', + password: 'Password123', + email: 'studentexample.com' + }], + ['email is missing a valid domain extension', { + username: 'Valid.User', + password: 'Password123', + email: 'student@example' + }], + ['username is missing', { + password: 'Password123', + email: 'student@example.com' + }], + ['password is missing', { + username: 'Valid.User', + email: 'student@example.com' + }], + ['email is missing', { + username: 'Valid.User', + password: 'Password123' + }] + ])('returns 400 and error payload when %s', async (_scenario, payload) => { + const response = await request(app).post('/users').send(payload) -describe('given incorrect or missing username and password', () => { - test('return status 400', async () => { - const response = await request(app).post('/users').send({ - username: 'user', - password: 'password', - email: 'not-an-email' - }) expect(response.statusCode).toBe(400) + expect(response.headers['content-type']).toMatch(/json/) + expect(response.body).toEqual({ + error: 'Invalid User' + }) + expect(response.body.userId).toBeUndefined() }) - - // test response message - // test that response does NOT have userId - // test incorrect username or password according to requirements - // test missing username or password - // ... }) \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index f07de70..f5a8977 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48,6 +48,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -1211,6 +1212,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true, + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -1566,6 +1568,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -2131,6 +2134,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz", "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==", "dev": true, + "peer": true, "dependencies": { "@eslint/eslintrc": "^2.0.0", "@eslint/js": "8.35.0", @@ -5920,6 +5924,7 @@ "version": "7.29.0", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", + "peer": true, "requires": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -6749,7 +6754,8 @@ "version": "8.8.2", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", - "dev": true + "dev": true, + "peer": true }, "acorn-jsx": { "version": "5.3.2", @@ -6999,6 +7005,7 @@ "version": "4.28.1", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", + "peer": true, "requires": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -7393,6 +7400,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz", "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==", "dev": true, + "peer": true, "requires": { "@eslint/eslintrc": "^2.0.0", "@eslint/js": "8.35.0", diff --git a/validation/validatePassword.js b/validation/validatePassword.js index 44d8a8b..b55bccf 100644 --- a/validation/validatePassword.js +++ b/validation/validatePassword.js @@ -1,10 +1,14 @@ function validatePassword(password) { + if (typeof password !== 'string') { + return false; + } + const validLength = password.length >= 8; const hasNumber = /[0-9]/g.test(password); const hasUpperCaseLetters = /[A-Z]/g.test(password); const hasLowerCaseLetters = /[a-z]/g.test(password); - const hasSpecialCharacters = /[\W]/g.test(password); + const hasSpecialCharacters = /[^a-zA-Z0-9]/g.test(password); return validLength && hasNumber && hasLowerCaseLetters && hasUpperCaseLetters && !hasSpecialCharacters; } -module.exports = validatePassword; +module.exports = validatePassword; \ No newline at end of file diff --git a/validation/validateUsername.js b/validation/validateUsername.js index 30213b1..1b80cc2 100644 --- a/validation/validateUsername.js +++ b/validation/validateUsername.js @@ -1,7 +1,11 @@ function validateUsername(username) { + if (typeof username !== 'string') { + return false; + } + const validLength = username.length >= 6 && username.length <=30; const allowedcharacters = /^[a-zA-Z0-9.]+$/g.test(username); return validLength && allowedcharacters; } -module.exports = validateUsername; +module.exports = validateUsername; \ No newline at end of file