Merge branch 'master' of https://github.coventry.ac.uk/5001CEM-1920SE…

…PJAN/reisborw into ui-fix
dhirk · Dec 2, 2019 · 6e374956a4bb1269cbcc5b046b209b9b6a9546f3 · 6e37495
2 parents 0c4c536 + e739af1
commit 6e374956a4bb1269cbcc5b046b209b9b6a9546f3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/core/views/profile.hbs b/core/views/profile.hbs
@@ -4,8 +4,8 @@
         <h1>Profile</h1>  
         <p>User Score: {{score}} </p>   
         <form action="/profile-action" enctype="multipart/form-data" method="post">
-          <p><input type="file" name="avatar" id="avatar-input"></p>
-          <p><input type="submit" value="Create" id="submit"></p>
+          <p><input type="file" accept=".png" name="avatar" id="avatar-input"></p>
+          <p><input type="submit" value="Upload" id="submit"></p>
         </form> 
     </main>
 

diff --git a/unit test/answer.spec.js b/unit test/answer.spec.js
@@ -150,12 +150,10 @@ describe('addStars()', () => {
 		await answer.createAnswer(request1, '21/11/2019')
 		await answer.createAnswer(request2, '21/11/2019')
 		const data = await answer.getAnswersByQuestion(3)
-		console.table(data)
 		const bronzeAnswerArray = [1]
 		const silveranswerArray = [2]
 		const goldAnswerArray = [3]
-		const stars = await answer.addStars(data, bronzeAnswerArray, silveranswerArray, goldAnswerArray)
-		console.table(stars)
+		await answer.addStars(data, bronzeAnswerArray, silveranswerArray, goldAnswerArray)
 		//ASSERT
 		expect(data[0].bronze).toBe('true')
 		expect(data[1].silver).toBe('true')

diff --git a/unit test/badge.spec.js b/unit test/badge.spec.js
@@ -17,12 +17,10 @@ describe('addStars()', () => {
 		await question.insertQuestion(body1,session,'09/11/2019')
 		await question.insertQuestion(body2,session,'09/11/2019')
 		const data = await question.getAllQuestions()
-		console.table(data)
 		const bronzeQuestionArray = [1]
 		const silverQuestionArray = [2]
 		const goldQuestionArray = [3]
-		const stars = await badge.addStars(data, bronzeQuestionArray, silverQuestionArray, goldQuestionArray)
-		console.table(stars)
+		await badge.addStars(data, bronzeQuestionArray, silverQuestionArray, goldQuestionArray)
 		//ASSERT
 		expect(data[0].bronze).toBe('true')
 		expect(data[1].silver).toBe('true')
@@ -47,7 +45,6 @@ describe('bronzeQuestions()', () => {
 		await question.insertQuestion(body,session, '10/11/2019')
 		const data = await question.getAllUserId()
 		const check = await badge.bronzeQuestions(star, data)
-		console.log(check)
 		//ASSERT
 		expect(check).toStrictEqual([1])
 		done()

diff --git a/unit test/question.spec.js b/unit test/question.spec.js
@@ -79,7 +79,6 @@ describe('getAll()', () => {
 		await question.insertQuestion(body,session, '10/11/2019')
 		await question.insertQuestion(body1,session,'09/11/2019')
 		const data = await question.getAllQuestions()
-		console.table(data)
 		//ASSERT
 		expect(data[0].title).toBe('Mario Cart')
 		expect(data[1].title).toBe('Super Mario Bros')