Skip to content

Added changes, Mock Tests #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
KSohkin wants to merge 1 commit into from
Closed

Added changes, Mock Tests #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 91 additions & 33 deletions app.mock.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
// ...
})
100 changes: 72 additions & 28 deletions app.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
// ...
})
10 changes: 9 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions validation/validatePassword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 5 additions & 1 deletion validation/validateUsername.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Loading