Issue: Adding/Fixing tests (#7)

server/src/app.ts

@@ -2,7 +2,6 @@ import express, { Application } from 'express';
 import routes from "./routes/routes";
 import bodyParser from 'body-parser';
 import cors from 'cors';
-import mysql from 'mysql2';
 // Boot express
 const app: Application = express();
 

server/src/controllers/categoryController/index.ts

@@ -20,7 +20,7 @@ const category = new Category();
 router.route('/').post(async (request: Request, response: Response) => {
 	const {category} = request.body;
 	try {
-		const input = (` INSERT INTO category(navn) VALUES (?);`)
+		const input = (` INSERT INTO category(name) VALUES (?);`)
 		return response.status(200).json(
             await query(input,[category])
         );

server/src/controllers/categoryController/tests/categoryController.test.ts

@@ -11,7 +11,9 @@ describe('Test categoryController', () => {
     });
 
     it('Request /api/category should return request of 200!', async () => {
-        const result = await request(app).get('/api/category').send();
+        const result = await request(app)
+        .get('/api/category')
+        .send()
 
         expect(result.status).toBe(200);
     });
@@ -20,6 +22,6 @@ describe('Test categoryController', () => {
         const result = await request(app).get('/api/category/1').send();
 
         expect(result.status).toBe(200);
-        expect(result.body.data[0]?.navn).toBe('Antikviteter og Kunst');
+        expect(result.body.data[0]?.name).toBe('Antikviteter og Kunst');
     });
-});
\ No newline at end of file
+});

server/src/controllers/postcontroller/index.ts

@@ -36,7 +36,7 @@ router.route('/').post(async (request: Request, response: Response) => {
 router.route('/').get(async (_: Request, response: Response) => {
 	try {
 		//response.status(200).json(await query("SELECT * FROM post;",""));
-		const input = `SELECT p.id, p.title, p.description, p.timestamp, p.owner, category.navn, p.imageUrl 
+		const input = `SELECT p.id, p.title, p.description, p.timestamp, p.owner, category.name, p.imageUrl 
 		FROM post as p
 		INNER JOIN category ON category.categoryid = p.categoryid;`
 		response.status(200).json(await query(input,""));
@@ -50,7 +50,7 @@ router.route('/:id').get(async (request: Request, response: Response) => {
 	const postId = request.params.id;
 	try {
 		//response.status(200).json(await query("SELECT * FROM post WHERE id=?;",[postId]));
-		const input = `SELECT p.id, p.title, p.description, p.timestamp, p.owner, category.navn, p.imageUrl 
+		const input = `SELECT p.id, p.title, p.description, p.timestamp, p.owner, category.name, p.imageUrl 
 		FROM post as p
 		INNER JOIN category ON category.categoryid = p.categoryid WHERE p.id=?;`
 		response.status(200).json(await query(input,[postId]));

server/src/controllers/postcontroller/tests/postController.test.ts

+import request from 'supertest';
+import app from '../../../app';
+
+describe('Test postController', () => {
+    beforeAll(async () => { // kjører før testing
+        console.log("Post controller test starting...");
+    });
+
+    afterAll(async () => { // kjører når all testing er gått gjennom
+        console.log("...Test ending");
+    });
+
+    it('Request /api/post should return request of 200!', async () => {
+        const result = await request(app)
+        .get('/api/post')
+        .send()
+
+        expect(result.status).toBe(200);
+    });
+
+    it('Request /api/post/1 should return data with name "test"!', async () => {
+        const result = await request(app).get('/api/post/1').send();
+
+        expect(result.status).toBe(200);
+        expect(result.body.data[0]?.title).toBe('test');
+    });
+
+});
\ No newline at end of file

server/src/controllers/userController/tests/userController.test.ts

+import request from 'supertest';
+import app from '../../../app';
+
+describe('Test userController', () => {
+    beforeAll(async () => { // kjører før testing
+        console.log("User controller test starting...");
+    });
+
+    afterAll(async () => { // kjører når all testing er gått gjennom
+        console.log("...Test ending");
+    });
+
+    it('Request /api/category should return request of 200!', async () => {
+        const result = await request(app)
+        .get('/api/user')
+        .send()
+
+        expect(result.status).toBe(200);
+    });
+
+    it('Request /api/category/1 should return data with name "zorg"!', async () => {
+        const result = await request(app).get('/api/user/1').send();
+
+        expect(result.status).toBe(200);
+        expect(result.body.data[0]?.username).toBe('zorg');
+    });
+});
\ No newline at end of file

server/src/routes/routes.ts

-import postController from '../controllers/postcontroller';
+import postController from '../controllers/postController';
 import categoryController from '../controllers/categoryController';
 import userController from '../controllers/userController';
 import express from 'express';

server/src/services/db.ts

@@ -9,5 +9,5 @@ async function query(sql:any, params:any) {
 }
 
 export default {
-	query
+	query,
 }