diff --git a/src/config.js b/src/config.js index 86fbefd..1bc3721 100644 --- a/src/config.js +++ b/src/config.js @@ -2,8 +2,6 @@ var fs = require('fs'); var config = undefined; -console.log(process.env.npm_lifecycle_script) - // Check to see if launched in test mode if (process.env.npm_lifecycle_script === 'node test.js') { config = JSON.parse(fs.readFileSync('test.json')); diff --git a/src/utils/getIP.js b/src/utils/getIP.js index 8379ec0..cc11057 100644 --- a/src/utils/getIP.js +++ b/src/utils/getIP.js @@ -1,5 +1,5 @@ var fs = require('fs'); -var config = JSON.parse(fs.readFileSync('config.json')); +var config = require('./config.js'); module.exports = function getIP(req) { return config.behindProxy ? req.headers['x-forwarded-for'] : req.connection.remoteAddress; diff --git a/test/cases/oldSubmitSponsorTimes.js b/test/cases/oldSubmitSponsorTimes.js index 4c0b8a1..d205df5 100644 --- a/test/cases/oldSubmitSponsorTimes.js +++ b/test/cases/oldSubmitSponsorTimes.js @@ -3,14 +3,24 @@ var request = require('request'); var utils = require('../utils.js'); +var databases = require('../../src/databases/databases.js'); +var db = databases.db; + describe('postVideoSponsorTime (Old submission method)', () => { it('Should be able to submit a time (GET)', (done) => { request.get(utils.getbaseURL() + "/api/postVideoSponsorTimes?videoID=djgofQKWmXc&startTime=1&endTime=10&userID=test", null, (err, res, body) => { if (err) done(false); - else if (res.statusCode === 200) done(); - else done(false); + else if (res.statusCode === 200) { + let row = db.prepare("SELECT startTime, endTime, category FROM sponsorTimes WHERE videoID = ?").get(videoID); + if (row.startTime === 1 && row.endTime === 10 && row.category === "sponsor") { + done() + return; + } + } + + done(false); }); }); @@ -19,8 +29,15 @@ describe('postVideoSponsorTime (Old submission method)', () => { + "/api/postVideoSponsorTimes?videoID=djgofQKWmXc&startTime=1&endTime=10&userID=test", null, (err, res, body) => { if (err) done(false); - else if (res.statusCode === 200) done(); - else done(false); + else if (res.statusCode === 200) { + let row = db.prepare("SELECT startTime, endTime, category FROM sponsorTimes WHERE videoID = ?").get(videoID); + if (row.startTime === 1 && row.endTime === 10 && row.category === "sponsor") { + done() + return; + } + } + + done(false); }); }); diff --git a/test/cases/postSkipSegments.js b/test/cases/postSkipSegments.js index e058466..446d802 100644 --- a/test/cases/postSkipSegments.js +++ b/test/cases/postSkipSegments.js @@ -3,14 +3,24 @@ var request = require('request'); var utils = require('../utils.js'); +var databases = require('../../src/databases/databases.js'); +var db = databases.db; + describe('postSkipSegments', () => { it('Should be able to submit a single time (Params method)', (done) => { request.post(utils.getbaseURL() + "/api/postVideoSponsorTimes?videoID=djgofQKWmXc&startTime=1&endTime=10&userID=test&category=sponsor", null, (err, res, body) => { if (err) done(false); - else if (res.statusCode === 200) done(); - else done(false); + else if (res.statusCode === 200) { + let row = db.prepare("SELECT startTime, endTime, category FROM sponsorTimes WHERE videoID = ?").get(videoID); + if (row.startTime === 1 && row.endTime === 10 && row.category === "sponsor") { + done() + return; + } + } + + done(false); }); }); @@ -27,8 +37,15 @@ describe('postSkipSegments', () => { }), (err, res, body) => { if (err) done(false); - else if (res.statusCode === 200) done(); - else done(false); + else if (res.statusCode === 200) { + let row = db.prepare("SELECT startTime, endTime, category FROM sponsorTimes WHERE videoID = ?").get(videoID); + if (row.startTime === 0 && row.endTime === 10 && row.category === "sponsor") { + done() + return; + } + } + + done(false); }); }); @@ -48,8 +65,21 @@ describe('postSkipSegments', () => { }), (err, res, body) => { if (err) done(false); - else if (res.statusCode === 200) done(); - else done(false); + else if (res.statusCode === 200) { + let rows = db.prepare("SELECT startTime, endTime, category FROM sponsorTimes WHERE videoID = ?").all(videoID); + + if (rows.length !== 2) done(false); + for (const row of rows) { + if (row.startTime !== 1 || row.endTime !== 10 || row.category !== "sponsor") { + done(false) + return; + } + } + + done() + } + + done(false); }); });