From fa85284f9247b309e26289f19c165cb76ec61f98 Mon Sep 17 00:00:00 2001 From: lingamr Date: Mon, 2 Dec 2019 05:38:01 +0000 Subject: [PATCH] REMOVED UNUSED REQUIREMENTS Changed code for warnings. --- acceptanceTests/login.test.js | 3 ++- archive/index.specx.js | 6 +++--- modules/forum.js | 17 ++++++++++------- modules/home.js | 8 ++++---- modules/messages.js | 4 ++-- modules/update.js | 14 ++++++++------ modules/user.js | 8 +++++--- unit tests/forum.spec.js | 2 +- unit tests/home.spec.js | 2 +- 9 files changed, 36 insertions(+), 28 deletions(-) diff --git a/acceptanceTests/login.test.js b/acceptanceTests/login.test.js index b3a58e4..4ff9e99 100644 --- a/acceptanceTests/login.test.js +++ b/acceptanceTests/login.test.js @@ -59,7 +59,8 @@ describe('Registering', () => { //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 }) ) + /*expect( await page.evaluate( () => { + document.querySelector('h1').innerText,document.querySelectorAll('forumlist').innerText})) .toBe(undefined)*/ /*expect( await page.evaluate( () => document.querySelector('h1').innerText ) ) .toBe('FORUM')*/ diff --git a/archive/index.specx.js b/archive/index.specx.js index 93f7ad4..3ab55e6 100644 --- a/archive/index.specx.js +++ b/archive/index.specx.js @@ -1,10 +1,10 @@ 'use strict' -const request = require('supertest') -const status = require('http-status-codes') +//const request = require('supertest') +//const status = require('http-status-codes') -const server = require('../../index.js') +//const server = require('../../index.js') beforeAll( async() => console.log('Jest starting!')) diff --git a/modules/forum.js b/modules/forum.js index 1f0659b..12203a2 100644 --- a/modules/forum.js +++ b/modules/forum.js @@ -1,10 +1,10 @@ 'use strict' -const bcrypt = require('bcrypt-promise') -const fs = require('fs-extra') -const mime = require('mime-types') +//const bcrypt = require('bcrypt-promise') +//const fs = require('fs-extra') +//const mime = require('mime-types') const sqlite = require('sqlite-async') -const saltRounds = 10 +//const saltRounds = 10 module.exports = class Forum { @@ -14,7 +14,8 @@ module.exports = class Forum { // we need this table to store the forums details const sql = `CREATE TABLE IF NOT EXISTS forums (id INTEGER PRIMARY KEY AUTOINCREMENT, forum_name TEXT, forum_description TEXT, forum_message TEXT, - created_date date default CURRENT_DATE, created_time date default CURRENT_TIME, forum_link TEXT, user_id INTEGER, user_name TEXT, profile TEXT, + created_date date default CURRENT_DATE, created_time date default CURRENT_TIME, + forum_link TEXT, user_id INTEGER, user_name TEXT, profile TEXT, FOREIGN KEY (user_id) REFERENCES user (id), FOREIGN KEY (user_name) REFERENCES user (user));` await this.db.run(sql) return this @@ -27,8 +28,10 @@ module.exports = class Forum { if (forum.forum_description.length === 0) throw new Error('missing forum description') if (forum.forum_message.length === 0) throw new Error('missing initial message') const sql = `INSERT INTO forums(forum_name, forum_description, forum_message, created_date, created_time, - forum_link, user_id, user_name, profile) VALUES("${forum.forum_name}","${forum.forum_description}", "${forum.forum_message}", (DATE('now')), (TIME('now')), - "${forum.forum_links}", "${selectedUserData.id}", "${selectedUserData.user}", "${selectedUserData.profile}");` + forum_link, user_id, user_name, profile) VALUES("${forum.forum_name}","${forum.forum_description}", + "${forum.forum_message}", (DATE('now')), (TIME('now')), + "${forum.forum_links}", "${selectedUserData.id}", "${selectedUserData.user}", + "${selectedUserData.profile}");` const data = await this.db.run(sql) return data } catch (err) { diff --git a/modules/home.js b/modules/home.js index 7174d71..c740df5 100644 --- a/modules/home.js +++ b/modules/home.js @@ -1,10 +1,10 @@ 'use strict' -const bcrypt = require('bcrypt-promise') -const fs = require('fs-extra') -const mime = require('mime-types') +//const bcrypt = require('bcrypt-promise') +//const fs = require('fs-extra') +//const mime = require('mime-types') const sqlite = require('sqlite-async') -const saltRounds = 10 +//const saltRounds = 10 //const Forum = require('./forum.js') diff --git a/modules/messages.js b/modules/messages.js index 6ad6680..35507d1 100644 --- a/modules/messages.js +++ b/modules/messages.js @@ -2,7 +2,7 @@ 'use strict' const bcrypt = require('bcrypt-promise') -const fs = require('fs-extra') +//const fs = require('fs-extra') const mime = require('mime-types') const sqlite = require('sqlite-async') const saltRounds = 10 @@ -57,4 +57,4 @@ module.exports = class Messages { } } -} \ No newline at end of file +} diff --git a/modules/update.js b/modules/update.js index db53119..133bda2 100644 --- a/modules/update.js +++ b/modules/update.js @@ -1,10 +1,10 @@ 'use strict' -const bcrypt = require('bcrypt-promise') -const fs = require('fs-extra') -const mime = require('mime-types') +//const bcrypt = require('bcrypt-promise') +//const fs = require('fs-extra') +//const mime = require('mime-types') const sqlite = require('sqlite-async') -const saltRounds = 10 +//const saltRounds = 10 module.exports = class Update { constructor(dbName = ':memory:') { @@ -29,7 +29,8 @@ module.exports = class Update { if (message.content.length === 0) throw new Error('empty comment') const sql = `INSERT INTO messages(created_date, created_time, content, visibility, user_id, user_name, profile, forum_id) VALUES((DATE('now')), (TIME('now')), - "${message.content}","true","${selectedUserData.id}", "${selectedUserData.user}", "${selectedUserData.profile}","${message.forum_id}");` + "${message.content}","true","${selectedUserData.id}", "${selectedUserData.user}", + "${selectedUserData.profile}","${message.forum_id}");` await this.db.run(sql) return true } @@ -48,7 +49,8 @@ module.exports = class Update { } /*async updateMessage(message,selectedUserData) { if(selectedUserData.user !== 'admin') throw new Error('Only Admin User can alter comments') - const sql = `Update messages set visibility="${message.visibility}" where forum_id="${message.forum_id}" AND message_id="${message.message_id}"` + const sql = `Update messages set visibility="${message.visibility}" where forum_id="${message.forum_id}" + AND message_id="${message.message_id}"` await this.db.run(sql) return true }*/ diff --git a/modules/user.js b/modules/user.js index 20a0539..8e6bc48 100644 --- a/modules/user.js +++ b/modules/user.js @@ -2,8 +2,8 @@ 'use strict' const bcrypt = require('bcrypt-promise') -const fs = require('fs-extra') -const mime = require('mime-types') +//const fs = require('fs-extra') +//const mime = require('mime-types') const sqlite = require('sqlite-async') const saltRounds = 10 @@ -13,7 +13,9 @@ module.exports = class User { return (async() => { this.db = await sqlite.open(dbName) // we need this table to store the user accounts - const sql = 'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTOINCREMENT, user TEXT, pass TEXT, profile TEXT);' + const sql = `CREATE TABLE IF NOT EXISTS users + (id INTEGER PRIMARY KEY AUTOINCREMENT, + user TEXT, pass TEXT, profile TEXT);` await this.db.run(sql) return this })() diff --git a/unit tests/forum.spec.js b/unit tests/forum.spec.js index d4c42a5..90de0c9 100644 --- a/unit tests/forum.spec.js +++ b/unit tests/forum.spec.js @@ -125,10 +125,10 @@ describe('Load the Forums()', () => { describe('Search the forum()', () => { test('Get the desired data from search', async done => { + expect.assertions(1) const forums = await new Forums() const data = await forums.searchForumsData('data') expect(data).toEqual([]) - expect.assertions(1) done() }) }) diff --git a/unit tests/home.spec.js b/unit tests/home.spec.js index a1acac0..dfbd126 100644 --- a/unit tests/home.spec.js +++ b/unit tests/home.spec.js @@ -4,7 +4,7 @@ const Home = require('../modules/home.js') //const Forums = require('../modules/forum.js') //const Accounts = require('../modules/user.js') -const sqlite = require('sqlite-async') +//const sqlite = require('sqlite-async') describe('Home()', () => {