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

…PJAN/lingamr

acceptanceTests/login.test.js

@@ -48,7 +48,7 @@ describe('Registering', () => {
 		//ACT
 		await page.type('input[name=user]', 'NewUser')
 		await page.type('input[name=pass]', 'password')
-		await page.type('input[type=file]','avatar')
+		await page.type('input[type=file]','./public/avatars/')
 		//await page.click('input[type=submit]')
 		await page.click('[type=submit]')
 		await page.goto('http://localhost:8080/login', { timeout: 30000, waitUntil: 'load' })
@@ -58,9 +58,11 @@ describe('Registering', () => {
 		await page.click('[type=submit]')
 		//ASSERT
 		//check that the user is taken to the homepage after attempting to login as the new user:
-		/*await page.waitForSelector('h1')
-		expect( await page.evaluate( () => {document.querySelector('h1').innerText, document.querySelectorAll('forumlist').innerText }) )
+		await page.waitForSelector('h1')
+		/*expect( await page.evaluate( () => {document.querySelector('h1').innerText, document.querySelectorAll('forumlist').innerText }) )
 			.toBe(undefined)*/
+		/*expect( await page.evaluate( () => document.querySelector('h1').innerText ) )
+			.toBe('FORUM')*/
 
 		// grab a screenshot
 		const image = await page.screenshot()