Added tests for server

.gitignore

@@ -1,2 +1,4 @@
 node_modules
-coverage
+coverage
+/.idea/
+.idea

app.mock.test.js

@@ -1,22 +1,20 @@
+
 const createApp = require('./app')
 const request = require('supertest')
 const validateUsername = require('./validation/validateUsername')
 const validatePassword = require('./validation/validatePassword')
 
-//Mock validateEmail to isolate tests
-jest.mock('./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);
-    })
-})
-
+// Mock the email validation to avoid the 2-second delay
+jest.mock('./validation/validateEmail')
 const validateEmail = require('./validation/validateEmail')
+
 const app = createApp(validateUsername, validatePassword, validateEmail)
 
 describe('given correct username and password', () => {
+    beforeEach(() => {
+        validateEmail.mockReturnValue(true)
+    })
+
     test('return status 200', async () => {
         const response = await request(app).post('/users').send({
             username: 'Username',
@@ -35,13 +33,39 @@ describe('given correct username and password', () => {
         expect(response.body.userId).toBeDefined();
     })
 
-    // test response content type?
-    // test response message
-    // test response user id value
-    // ...
+    test('returns correct userId value', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.body.userId).toBe('1')
+    })
+
+    test('returns success message', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.body.message).toBe('Valid User')
+    })
+
+    test('response content type is JSON', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.headers['content-type']).toMatch(/json/)
+    })
 })
 
 describe('given incorrect or missing username and password', () => {
+    beforeEach(() => {
+        validateEmail.mockReturnValue(false)
+    })
+
     test('return status 400', async () => {
         const response = await request(app).post('/users').send({
             username: 'user',
@@ -51,9 +75,220 @@ describe('given incorrect or missing username and password', () => {
         expect(response.statusCode).toBe(400)
     })
 
-    // test response message
-    // test that response does NOT have userId
-    // test incorrect username or password according to requirements
-    // test missing username or password
-    // ...
+    test('response does NOT have userId', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'user',
+            password: 'password',
+            email: 'not-an-email'
+        })
+        expect(response.body.userId).toBeUndefined()
+    })
+
+    test('returns error message', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'user',
+            password: 'password',
+            email: 'not-an-email'
+        })
+        expect(response.body.error).toBe('Invalid User')
+    })
+
+    test('rejects username that is too short', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'short',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+        expect(response.body.error).toBe('Invalid User')
+    })
+
+    test('rejects password that is too short', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Pass1',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects password without uppercase letter', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects password without lowercase letter', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'PASSWORD123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects password without number', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'PasswordABC',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects password with special characters', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password@123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects invalid email format', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'not-an-email'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects email without @ symbol', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'studentexample.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects email without domain extension', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'student@example'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects missing email', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects missing username', async () => {
+        const response = await request(app).post('/users').send({
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects missing password', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+})
+
+describe('valid username requirements', () => {
+    beforeEach(() => {
+        validateEmail.mockReturnValue(true)
+    })
+
+    test('accepts username with 6 characters', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'user12',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(200)
+    })
+
+    test('accepts username with 30 characters', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'user.name.with.dots123456789',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(200)
+    })
+
+    test('accepts username with letters and numbers', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username123',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(200)
+    })
+
+    test('accepts username with periods', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'user.name.test',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(200)
+    })
+
+    test('rejects username with special characters', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'user@name',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+
+    test('rejects username that is too long', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'user.name.with.too.many.characters.here',
+            password: 'Password123',
+            email: 'student@example.com'
+        })
+        expect(response.statusCode).toBe(400)
+    })
+})
+
+describe('valid email requirements', () => {
+    beforeEach(() => {
+        validateEmail.mockReturnValue(true)
+    })
+
+    test('accepts valid email with .com domain', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'user@example.com'
+        })
+        expect(response.statusCode).toBe(200)
+    })
+
+    test('accepts valid email with .edu domain', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'student@university.edu'
+        })
+        expect(response.statusCode).toBe(200)
+    })
+
+    test('accepts valid email with .org domain', async () => {
+        const response = await request(app).post('/users').send({
+            username: 'Username',
+            password: 'Password123',
+            email: 'contact@organization.org'
+        })
+        expect(response.statusCode).toBe(200)
+    })
 })