From 3e234a74262c77a21970fa6f98ac82c6eeca583a Mon Sep 17 00:00:00 2001 From: "Mark Tyers (aa7401)" Date: Thu, 10 Oct 2019 18:56:07 +0100 Subject: [PATCH 1/2] removed unneeded package --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 8359da0..22940a0 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "author": "", "license": "ISC", "dependencies": { - "bcrypt": "^3.0.6", "bcrypt-promise": "^2.0.0", "fs-extra": "^7.0.1", "handlebars": "^4.4.2", From abb8791f766fd0e7386dac4929bd103ec1d0638b Mon Sep 17 00:00:00 2001 From: Mark Tyers Date: Fri, 11 Oct 2019 08:05:06 +0100 Subject: [PATCH 2/2] added a githooks directory --- .eslintrc.json | 2 +- .githooks/pre-commit | 3 +++ archive/auth.specx.js | 60 ------------------------------------------- 3 files changed, 4 insertions(+), 61 deletions(-) create mode 100755 .githooks/pre-commit delete mode 100644 archive/auth.specx.js diff --git a/.eslintrc.json b/.eslintrc.json index 6e05843..83c0f50 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -26,7 +26,7 @@ "linebreak-style": ["warn", "unix"], "max-depth": ["error", 3], "max-len": ["warn", { "code": 120, "tabWidth": 4 }], - "max-lines": ["error", 100], + "max-lines": ["warn", 150], "max-lines-per-function": ["error", 20], "max-nested-callbacks": ["error", 4], "max-params": ["error", 5], diff --git a/.githooks/pre-commit b/.githooks/pre-commit new file mode 100755 index 0000000..23c0362 --- /dev/null +++ b/.githooks/pre-commit @@ -0,0 +1,3 @@ +#!/bin/sh + +./node_modules/.bin/eslint . diff --git a/archive/auth.specx.js b/archive/auth.specx.js deleted file mode 100644 index 6dfca2f..0000000 --- a/archive/auth.specx.js +++ /dev/null @@ -1,60 +0,0 @@ - -'use strict' - -const puppeteer = require('puppeteer') - -let page -let browser - -const baseURL = 'http://localhost:8080' - -beforeAll( async() => { - const width = 800 - const height = 600 - browser = await puppeteer.launch({ - headless: true, - slowMo: 40, - args: [`--window-size=${width},${height}`, '--disable-http2'] - }) - page = await browser.newPage() - await page.setViewport({ width, height }) -}) - -afterAll( async() => await browser.close()) - -describe('checking home screen is protected', () => { - test('home screen redirects to login if not logged in', async done => { - await page.waitFor(1000) - await page.goto('http://localhost:8080/logout') - await page.waitFor(1000) - //await page.goto('http://localhost:8080/', { waitUntil: 'domcontentloaded' }) - const title = await page.title() - expect(title).toBe('Log In') - done() - }) -}) - -describe('registering an account', () => { - test('home screen redirects to login if not logged in', async done => { - try { - await page.waitFor(1000) - await page.goto(`${baseURL}/register`, { waitUntil: 'domcontentloaded' }) - await page.type('input[name=user]', 'jbloggs') - await page.type('input[name=pass]', 'p455w0rd') - const input = await page.$('input[name=avatar]') - await input.uploadFile('screenshots/person.png') - await page.screenshot({ path: 'screenshots/completedRegForm.png' }) - await page.click('input[type=submit]') - await page.waitFor(1000) - await page.screenshot({ path: 'screenshots/accountCreated.png' }) - const title = await page.title() - expect(title).toBe('Log In') - const text = await page.evaluate(() => document.body.textContent) - expect(text).toContain('you need to log in') - } catch(err) { - //done.fail(new Error(err.message)) - } finally { - done() - } - }) -})