Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-12 06:27:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added DB checks to tests and fixed getIP using the wrong config

Browse Source
This commit is contained in:
Ajay Ramachandran
2020-04-06 17:25:20 -04:00
parent 67c608e76f
commit 8eca458e38
4 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.js
View File

@@ -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'));

2
src/utils/getIP.js
View File

@@ -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;

25
test/cases/oldSubmitSponsorTimes.js
View File

@@ -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);
});
});

42
test/cases/postSkipSegments.js
View File

@@ -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);
});
});