From 178ed1e5af850be00e10527e79bedfd4333c61bf Mon Sep 17 00:00:00 2001 From: Michael C Date: Wed, 7 Jul 2021 03:47:08 -0400 Subject: [PATCH] replace if tests with assert --- test/cases/getIsUserVIP.ts | 25 +- test/cases/getLockCategories.ts | 62 ++-- test/cases/getLockCategoriesByHash.ts | 169 ++++------ test/cases/getSavedTimeForUser.ts | 15 +- test/cases/getSegmentInfo.ts | 305 +++++++---------- test/cases/getSkipSegments.ts | 437 +++++++++++------------- test/cases/getSkipSegmentsByHash.ts | 318 ++++++++---------- test/cases/getUserID.ts | 417 ++++++++++------------- test/cases/getUserInfo.ts | 138 ++++---- test/cases/lockCategoriesRecords.ts | 223 ++++--------- test/cases/oldGetSponsorTime.ts | 47 ++- test/cases/oldSubmitSponsorTimes.ts | 38 +-- test/cases/postClearCache.ts | 21 +- test/cases/postPurgeAllSegments.ts | 6 +- test/cases/postSkipSegments.ts | 460 +++++++++++--------------- test/cases/postWarning.ts | 63 ++-- test/cases/segmentShift.ts | 33 +- test/cases/setUsername.ts | 82 ++--- test/cases/shadowBanUser.ts | 98 +++--- test/cases/unBan.ts | 52 +-- test/cases/voteOnSponsorTime.ts | 366 +++++++------------- test/test.ts | 10 +- 22 files changed, 1344 insertions(+), 2041 deletions(-) diff --git a/test/cases/getIsUserVIP.ts b/test/cases/getIsUserVIP.ts index 7f491c3..a293fb8 100644 --- a/test/cases/getIsUserVIP.ts +++ b/test/cases/getIsUserVIP.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {getbaseURL, Done} from '../utils'; import {db} from '../../src/databases/databases'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('getIsUserVIP', () => { before((done: Done) => { @@ -11,20 +12,20 @@ describe('getIsUserVIP', () => { it('Should be able to get a 200', (done: Done) => { fetch(getbaseURL() + "/api/isUserVIP?userID=supertestman") .then(res => { - if (res.status !== 200) done("non 200: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 200, "response should be 200"); + done(); }) - .catch(() => done("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should get a 400 if no userID', (done: Done) => { fetch(getbaseURL() + "/api/isUserVIP") .then(res => { - if (res.status !== 400) done("non 400: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400, "response should be 400"); + done(); }) - .catch(() => done("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should say a VIP is a VIP', (done: Done) => { @@ -33,11 +34,11 @@ describe('getIsUserVIP', () => { if (res.status !== 200) done("non 200: " + res.status); else { const data = await res.json(); - if (data.vip === true) done(); // pass - else done("Result was non-vip when should have been vip"); + assert.strictEqual(data.vip, true); + done(); } }) - .catch(() => done("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should say a normal user is not a VIP', (done: Done) => { @@ -46,10 +47,10 @@ describe('getIsUserVIP', () => { if (res.status !== 200) done("non 200: " + res.status); else { const data = await res.json(); - if (data.vip === false) done(); // pass - else done("Result was vip when should have been non-vip"); + assert.strictEqual(data.vip, false); + done(); } }) - .catch(() => done("couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/getLockCategories.ts b/test/cases/getLockCategories.ts index 177710e..eab9950 100644 --- a/test/cases/getLockCategories.ts +++ b/test/cases/getLockCategories.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {getHash} from '../../src/utils/getHash'; import {db} from '../../src/databases/databases'; +import assert from 'assert'; describe('getLockCategories', () => { @@ -27,58 +28,51 @@ describe('getLockCategories', () => { it('Should be able to get multiple locks', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories?videoID=getLock-1') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.categories.length !== 2) { - done(`Returned incorrect number of locks "${data.categories.length}"`); - } else if (data.categories[0] !== "sponsor") { - done(`Returned incorrect category "${data.categories[0]}"`); - } else if (data.categories[1] !== "interaction") { - done(`Returned incorrect category "${data.categories[1]}"`); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + const expected = { + categories: [ + "sponsor", + "interaction" + ] + }; + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get single locks', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories?videoID=getLock-2') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.categories.length !== 1) { - done('Returned incorrect number of locks "' + data.categories.length + '"'); - } else if (data.categories[0] !== "preview") { - done(`Returned incorrect category "${data.categories[0].category}"`); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + const expected = { + categories: [ + "preview" + ] + }; + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return 404 if no lock exists', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories?videoID=getLock-0') .then(res => { - if (res.status !== 404) done('non 404 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return 400 if no videoID specified', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories') .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/getLockCategoriesByHash.ts b/test/cases/getLockCategoriesByHash.ts index 585c08e..7734e58 100644 --- a/test/cases/getLockCategoriesByHash.ts +++ b/test/cases/getLockCategoriesByHash.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {getHash} from '../../src/utils/getHash'; import {db} from '../../src/databases/databases'; +import assert from 'assert'; describe('getLockCategoriesByHash', () => { @@ -31,146 +32,116 @@ describe('getLockCategoriesByHash', () => { it('Should be able to get multiple locks in one object', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories/67a65') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done(`Returned incorrect number of videos "${data.length}"`); - } else if (data[0].videoID !== "getLockHash-1") { - done(`Returned incorrect videoID "${data[0].videoID}"`); - } else if (data[0].hash !== getHash("getLockHash-1", 1)) { - done(`Returned incorrect hash "${data[0].hash}"`); - } else if (data[0].categories[0] !== "sponsor") { - done(`Returned incorrect category "${data[0].categories[0]}"`); - } else if (data[0].categories[1] !== "interaction") { - done(`Returned incorrect category "${data[0].categories[1]}"`); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + const expected = [{ + videoID: "getLockHash-1", + hash: getHash("getLockHash-1", 1), + categories: [ + "sponsor", + "interaction" + ] + }]; + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get single lock', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories/dff09') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of videos "' + data.length + '"'); - } else if (data[0].videoID !== "getLockHash-2") { - done(`Returned incorrect videoID "${data[0].videoID}"`); - } else if (data[0].hash !== getHash("getLockHash-2", 1)) { - done(`Returned incorrect hashedVideoID hash "${data[0].hash}"`); - } else if (data[0].categories.length !== 1) { - done(`Returned incorrect number of categories "${data[0].categories.length}"`); - } else if (data[0].categories[0] !== "preview") { - done(`Returned incorrect category "${data[0].categories[0]}"`); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + const expected = [{ + videoID: "getLockHash-2", + hash: getHash("getLockHash-2", 1), + categories: [ + "preview" + ] + }]; + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get by half full hash', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories/bf1b122fd5630e0df8626d00c4a95c58') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of videos "' + data.length + '"'); - } else if (data[0].videoID !== "getLockHash-3") { - done(`Returned incorrect videoID "${data[0].videoID}"`); - } else if (data[0].hash !== getHash("getLockHash-3", 1)) { - done(`Returned incorrect hashedVideoID hash "${data[0].hash}"`); - } else if (data[0].categories.length !== 1) { - done(`Returned incorrect number of categories "${data[0].categories.length}"`); - } else if (data[0].categories[0] !== "nonmusic") { - done(`Returned incorrect category "${data[0].categories[0]}"`); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + const expected = [{ + videoID: "getLockHash-3", + hash: getHash("getLockHash-3", 1), + categories: [ + "nonmusic" + ] + }]; + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get multiple by similar hash with multiple categories', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories/b05a') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 2) { - done(`Returned incorrect number of locks "${data.length}"`); - } else if (data[0].videoID !== "fakehash-1") { - done(`Returned incorrect videoID "${data[0].videoID}"`); - } else if (data[1].videoID !== "fakehash-2") { - done(`Returned incorrect videoID "${data[1].videoID}"`); - } else if (data[0].hash !== "b05a20424f24a53dac1b059fb78d861ba9723645026be2174c93a94f9106bb35") { - done(`Returned incorrect hashedVideoID hash "${data[0].hash}"`); - } else if (data[1].hash !== "b05acd1cd6ec7dffe5ffea64ada91ae7469d6db2ce21c7e30ad7fa62075d450") { - done(`Returned incorrect hashedVideoID hash "${data[1].hash}"`); - } else if (data[0].categories.length !== 1) { - done(`Returned incorrect number of categories "${data[0].categories.length}"`); - } else if (data[1].categories.length !== 2) { - done(`Returned incorrect number of categories "${data[1].categories.length}"`); - } else if (data[0].categories[0] !== "outro") { - done(`Returned incorrect category "${data[0].category}"`); - } else if (data[1].categories[0] !== "intro") { - done(`Returned incorrect category "${data[1].category}"`); - } else if (data[1].categories[1] !== "preview") { - done(`Returned incorrect category "${data[1].category}"`); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + const expected = [{ + videoID: "fakehash-1", + hash: "b05a20424f24a53dac1b059fb78d861ba9723645026be2174c93a94f9106bb35", + categories: [ + "outro" + ] + }, { + videoID: "fakehash-2", + hash: "b05acd1cd6ec7dffe5ffea64ada91ae7469d6db2ce21c7e30ad7fa62075d450", + categories: [ + "intro", + "preview" + ] + }]; + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return 404 once hash prefix varies', (done: Done) => { - fetch(getbaseURL() + '/api/lockCategories/aaaaaa') + fetch(getbaseURL() + '/api/lockCategories/b05aa') .then(res => { - if (res.status !== 404) done('non 404 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return 404 if no lock exists', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories/aaaaaa') .then(res => { - if (res.status !== 404) done('non 404 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return 400 if no videoID specified', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories/') .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return 400 if full hash sent', (done: Done) => { fetch(getbaseURL() + '/api/lockCategories/b05a20424f24a53dac1b059fb78d861ba9723645026be2174c93a94f9106bb35') .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/getSavedTimeForUser.ts b/test/cases/getSavedTimeForUser.ts index 94405f5..273f151 100644 --- a/test/cases/getSavedTimeForUser.ts +++ b/test/cases/getSavedTimeForUser.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {db} from '../../src/databases/databases'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('getSavedTimeForUser', () => { before(async () => { @@ -13,10 +14,16 @@ describe('getSavedTimeForUser', () => { it('Should be able to get a 200', (done: Done) => { fetch(getbaseURL() + "/api/getSavedTimeForUser?userID=testman") - .then(res => { - if (res.status !== 200) done("non 200"); - else done(); // pass + .then(async res => { + const data = await res.json(); + // (end-start)*minute * views + const savedMinutes = ((11-1)/60) * 50; + const expected = { + timeSaved: savedMinutes + }; + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => done("couldn't call endpoint")); + .catch((err) => done(err)); }); }); diff --git a/test/cases/getSegmentInfo.ts b/test/cases/getSegmentInfo.ts index 912619c..56fd4c8 100644 --- a/test/cases/getSegmentInfo.ts +++ b/test/cases/getSegmentInfo.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {db} from '../../src/databases/databases'; import {Done, getbaseURL} from '../utils'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; const ENOENTID = "0".repeat(64); const upvotedID = "a"+"0".repeat(63); @@ -43,231 +44,188 @@ describe('getSegmentInfo', () => { it('Should be able to retreive upvoted segment', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${upvotedID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "upvoted" && data[0].votes === 2) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[0].votes, 2); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive downvoted segment', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${downvotedID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "downvoted" && data[0].votes === -2) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "downvoted"); + assert.strictEqual(data[0].votes, -2); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive locked up segment', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${lockedupID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "locked-up" && data[0].locked === 1 && data[0].votes === 2) { - done(); - } else { - done ("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "locked-up"); + assert.strictEqual(data[0].locked, 1); + assert.strictEqual(data[0].votes, 2); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive infinite vote segment', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${infvotesID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "infvotes" && data[0].votes === 100000) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "infvotes"); + assert.strictEqual(data[0].votes, 100000); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive shadowhidden segment', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${shadowhiddenID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "shadowhidden" && data[0].shadowHidden === 1) { - done(); - } else { - done ("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "shadowhidden"); + assert.strictEqual(data[0].shadowHidden, 1); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive locked down segment', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${lockeddownID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "locked-down" && data[0].votes === -2 && data[0].locked === 1) { - done(); - } else { - done ("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "locked-down"); + assert.strictEqual(data[0].votes, -2); + assert.strictEqual(data[0].locked, 1); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive hidden segment', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${hiddenID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "hidden" && data[0].hidden === 1) { - done(); - } else { - done ("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "hidden"); + assert.strictEqual(data[0].hidden, 1); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive segment with old ID', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${oldID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "oldID" && data[0].votes === 1) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "oldID"); + assert.strictEqual(data[0].votes, 1); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive single segment in array', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUIDs=["${upvotedID}"]`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].videoID === "upvoted" && data[0].votes === 2) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[0].votes, 2); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to retreive multiple segments in array', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUIDs=["${upvotedID}", "${downvotedID}"]`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 2 && - (data[0].videoID === "upvoted" && data[0].votes === 2) && - (data[1].videoID === "downvoted" && data[1].votes === -2)) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[0].votes, 2); + assert.strictEqual(data[1].videoID, "downvoted"); + assert.strictEqual(data[1].votes, -2); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be possible to send unexpected query parameters', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${upvotedID}&fakeparam=hello&category=sponsor`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data[0].videoID === "upvoted" && data[0].votes === 2) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[0].votes, 2); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should return 400 if array passed to UUID', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=["${upvotedID}", "${downvotedID}"]`) .then(res => { - if (res.status !== 400) done("non 400 respone code: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 400 if bad array passed to UUIDs', (done: Done) => { fetch(getbaseURL() + "/api/segmentInfo?UUIDs=[not-quoted,not-quoted]") .then(res => { - if (res.status !== 400) done("non 404 respone code: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 400 if bad UUID passed', (done: Done) => { fetch(getbaseURL() + "/api/segmentInfo?UUID=notarealuuid") .then(res => { - if (res.status !== 400) done("non 400 respone code: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 400 if bad UUIDs passed in array', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUIDs=["notarealuuid", "anotherfakeuuid"]`) .then(res => { - if (res.status !== 400) done("non 400 respone code: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return good UUID when mixed with bad UUIDs', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUIDs=["${upvotedID}", "anotherfakeuuid"]`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].videoID === "upvoted" && data[0].votes === 2) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[0].votes, 2); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should cut off array at 10', function(done: Done) { @@ -275,34 +233,31 @@ describe('getSegmentInfo', () => { const filledIDArray = `["${upvotedID}", "${downvotedID}", "${lockedupID}", "${shadowhiddenID}", "${lockeddownID}", "${hiddenID}", "${fillerID1}", "${fillerID2}", "${fillerID3}", "${fillerID4}", "${fillerID5}"]`; fetch(getbaseURL() + `/api/segmentInfo?UUIDs=${filledIDArray}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - // last segment should be fillerID4 - if (data.length === 10 && data[0].videoID === "upvoted" && data[0].votes === 2 && data[9].videoID === "filler" && data[9].UUID === fillerID4) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 10); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[0].votes, 2); + assert.strictEqual(data[9].videoID, "filler"); + assert.strictEqual(data[9].UUID, fillerID4); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should not duplicate reponses', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUIDs=["${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${downvotedID}"]`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 2 && data[0].videoID === "upvoted" && data[0].votes === 2 && data[1].videoID === "downvoted" && data[1].votes === -2) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[0].votes, 2); + assert.strictEqual(data[1].videoID, "downvoted"); + assert.strictEqual(data[1].votes, -2); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 400 if UUID not found', (done: Done) => { @@ -311,41 +266,33 @@ describe('getSegmentInfo', () => { if (res.status !== 400) done("non 400 respone code: " + res.status); else done(); // pass }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to retreive multiple segments with multiple parameters', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${upvotedID}&UUID=${downvotedID}`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 2 && - (data[0].videoID === "upvoted" && data[0].votes === 2) && - (data[1].videoID === "downvoted" && data[1].votes === -2)) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[1].videoID, "downvoted"); + assert.strictEqual(data[0].votes, 2); + assert.strictEqual(data[1].votes, -2); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should not parse repeated UUID if UUIDs present', (done: Done) => { fetch(getbaseURL() + `/api/segmentInfo?UUID=${downvotedID}&UUID=${lockedupID}&UUIDs=["${upvotedID}"]`) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && - (data[0].videoID === "upvoted" && data[0].votes === 2)) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data[0].videoID, "upvoted"); + assert.strictEqual(data[0].votes, 2); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); }); diff --git a/test/cases/getSkipSegments.ts b/test/cases/getSkipSegments.ts index 06e64f2..a48fb62 100644 --- a/test/cases/getSkipSegments.ts +++ b/test/cases/getSkipSegments.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {db} from '../../src/databases/databases'; import {Done, getbaseURL} from '../utils'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('getSkipSegments', () => { before(async () => { @@ -29,372 +30,314 @@ describe('getSkipSegments', () => { it('Should be able to get a time by category 1', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&category=sponsor") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-0" && data[0].videoDuration === 100) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } - }) - .catch(() => "Couldn't call endpoint"); + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0"); + assert.strictEqual(data[0].videoDuration, 100); + done(); + }) + .catch(err => done(err)); }); it('Should be able to get a time by category and action type', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&category=sponsor&actionType=mute") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].segment[0] === 12 && data[0].segment[1] === 14 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-0-2" && data[0].videoDuration === 100) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 12); + assert.strictEqual(data[0].segment[1], 14); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0-2"); + assert.strictEqual(data[0].videoDuration, 100); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to get a time by category and multiple action types', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&category=sponsor&actionType=mute&actionType=skip") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 2 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-0" - && data[1].UUID === "1-uuid-0-2" && data[0].videoDuration === 100) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0"); + assert.strictEqual(data[1].UUID, "1-uuid-0-2"); + assert.strictEqual(data[0].videoDuration, 100); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to get a time by category and multiple action types (JSON array)', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments?videoID=testtesttest&category=sponsor&actionTypes=["mute","skip"]') .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 2 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-0" - && data[1].UUID === "1-uuid-0-2" && data[0].videoDuration === 100) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0"); + assert.strictEqual(data[1].UUID, "1-uuid-0-2"); + assert.strictEqual(data[0].videoDuration, 100); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to get a time by category for a different service 1', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest2&category=sponsor&service=PeerTube") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-0-1" && data[0].videoDuration === 120) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0-1"); + assert.strictEqual(data[0].videoDuration, 120); + done(); }) - .catch(() => "Couldn't call endpoint"); + .catch(err => done(err)); }); it('Should be able to get a time by category 2', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&category=intro") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].segment[0] === 20 && data[0].segment[1] === 33 - && data[0].category === "intro" && data[0].UUID === "1-uuid-2") { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 20); + assert.strictEqual(data[0].segment[1], 33); + assert.strictEqual(data[0].category, "intro"); + assert.strictEqual(data[0].UUID, "1-uuid-2"); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get a time by categories array', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&categories=[\"sponsor\"]") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-0" && data[0].videoDuration === 100) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0"); + assert.strictEqual(data[0].videoDuration, 100); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get a time by categories array 2', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&categories=[\"intro\"]") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].segment[0] === 20 && data[0].segment[1] === 33 - && data[0].category === "intro" && data[0].UUID === "1-uuid-2" && data[0].videoDuration === 101) { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 20); + assert.strictEqual(data[0].segment[1], 33); + assert.strictEqual(data[0].category, "intro"); + assert.strictEqual(data[0].UUID, "1-uuid-2"); + assert.strictEqual(data[0].videoDuration, 101); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 404 if all submissions are hidden', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=onlyHiddenSegments") .then(res => { - if (res.status !== 404) done("non 404 respone code: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get multiple times by category', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=multiple&categories=[\"intro\"]") .then(async res => { - if (res.status !== 200)done("Status code was: " + res.status); - else { - const body = await res.text(); - const data = JSON.parse(body); - if (data.length === 2) { - let success = true; - for (const segment of data) { - if ((segment.segment[0] !== 20 || segment.segment[1] !== 33 - || segment.category !== "intro" || segment.UUID !== "1-uuid-7") && - (segment.segment[0] !== 1 || segment.segment[1] !== 11 - || segment.category !== "intro" || segment.UUID !== "1-uuid-6")) { - success = false; - break; - } - } - - if (success) done(); - else done("Received incorrect body: " + body); - } else { - done("Received incorrect body: " + body); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "intro"); + assert.strictEqual(data[0].UUID, "1-uuid-6"); + assert.strictEqual(data[1].segment[0], 20); + assert.strictEqual(data[1].segment[1], 33); + assert.strictEqual(data[1].category, "intro"); + assert.strictEqual(data[1].UUID, "1-uuid-7"); + done(); }) - .catch(err => ("Couldn't call endpoint\n\n" + err)); + .catch(err => done(err)); }); it('Should be able to get multiple times by multiple categories', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&categories=[\"sponsor\", \"intro\"]") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const body = await res.text(); - const data = JSON.parse(body); - if (data.length === 2) { - - let success = true; - for (const segment of data) { - if ((segment.segment[0] !== 20 || segment.segment[1] !== 33 - || segment.category !== "intro" || segment.UUID !== "1-uuid-2") && - (segment.segment[0] !== 1 || segment.segment[1] !== 11 - || segment.category !== "sponsor" || segment.UUID !== "1-uuid-0")) { - success = false; - break; - } - } - - if (success) done(); - else done("Received incorrect body: " + body); - } else { - done("Received incorrect body: " + body); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0"); + assert.strictEqual(data[1].segment[0], 20); + assert.strictEqual(data[1].segment[1], 33); + assert.strictEqual(data[1].category, "intro"); + assert.strictEqual(data[1].UUID, "1-uuid-2"); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be possible to send unexpected query parameters', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&fakeparam=hello&category=sponsor") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const body = await res.text(); - const data = JSON.parse(body); - if (data.length === 1 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-0") { - done(); - } else { - done("Received incorrect body: " + body); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0"); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Low voted submissions should be hidden', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=test3&category=sponsor") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const body = await res.text(); - const data = JSON.parse(body); - if (data.length === 1 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-4") { - done(); - } else { - done("Received incorrect body: " + body); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-4"); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 404 if no segment found', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=notarealvideo") .then(res => { - if (res.status !== 404) done("non 404 respone code: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 400 if bad categories argument', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&categories=[not-quoted,not-quoted]") .then(res => { - if (res.status !== 400) done("non 400 respone code: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able send a comma in a query param', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest,test&category=sponsor") .then(async res => { - if (res.status !== 200) done ("Status code was: " + res.status); - else { - const body = await res.text(); - const data = JSON.parse(body); - if (data.length === 1 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-1") { - done(); - } else { - done("Received incorrect body: " + body); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-1"); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should always get locked segment', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=locked&category=intro") .then(async res => { - if (res.status !== 200) done ("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].segment[0] === 20 && data[0].segment[1] === 33 - && data[0].category === "intro" && data[0].UUID === "1-uuid-locked-8") { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 20); + assert.strictEqual(data[0].segment[1], 33); + assert.strictEqual(data[0].category, "intro"); + assert.strictEqual(data[0].UUID, "1-uuid-locked-8"); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get multiple categories with repeating parameters', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&category=sponsor&category=intro") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const body = await res.text(); - const data = JSON.parse(body); - if (data.length === 2) { - - let success = true; - for (const segment of data) { - if ((segment.segment[0] !== 20 || segment.segment[1] !== 33 - || segment.category !== "intro" || segment.UUID !== "1-uuid-2") && - (segment.segment[0] !== 1 || segment.segment[1] !== 11 - || segment.category !== "sponsor" || segment.UUID !== "1-uuid-0")) { - success = false; - break; - } - } - - if (success) done(); - else done("Received incorrect body: " + body); - } else { - done("Received incorrect body: " + body); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0"); + assert.strictEqual(data[1].segment[0], 20); + assert.strictEqual(data[1].segment[1], 33); + assert.strictEqual(data[1].category, "intro"); + assert.strictEqual(data[1].UUID, "1-uuid-2"); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get, categories param overriding repeating category', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments?videoID=testtesttest&categories=[\"sponsor\"]&category=intro") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const data = await res.json(); - if (data.length === 1 && data[0].segment[0] === 1 && data[0].segment[1] === 11 - && data[0].category === "sponsor" && data[0].UUID === "1-uuid-0") { - done(); - } else { - done("Received incorrect body: " + (await res.text())); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segment[0], 1); + assert.strictEqual(data[0].segment[1], 11); + assert.strictEqual(data[0].category, "sponsor"); + assert.strictEqual(data[0].UUID, "1-uuid-0"); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get specific segments with requiredSegments', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments?videoID=requiredSegmentVid-raw&requiredSegments=["requiredSegmentVid-raw-2","requiredSegmentVid-raw-3"]') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 2) done("expected 2 segments, got " + body.length); - else if (body[0].UUID !== 'requiredSegmentVid-raw-2' - || body[1].UUID !== 'requiredSegmentVid-raw-3') done("Did not recieve the correct segments\n" + JSON.stringify(body, null, 2)); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].UUID, "requiredSegmentVid-raw-2"); + assert.strictEqual(data[1].UUID, "requiredSegmentVid-raw-3"); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get specific segments with repeating requiredSegment', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments?videoID=requiredSegmentVid-raw&requiredSegment=requiredSegmentVid-raw-2&requiredSegment=requiredSegmentVid-raw-3') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 2) done("expected 2 segments, got " + body.length); - else if (body[0].UUID !== 'requiredSegmentVid-raw-2' - || body[1].UUID !== 'requiredSegmentVid-raw-3') done("Did not recieve the correct segments\n" + JSON.stringify(body, null, 2)); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].UUID, 'requiredSegmentVid-raw-2'); + assert.strictEqual(data[1].UUID, 'requiredSegmentVid-raw-3'); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/getSkipSegmentsByHash.ts b/test/cases/getSkipSegmentsByHash.ts index d1da36e..e4112ae 100644 --- a/test/cases/getSkipSegmentsByHash.ts +++ b/test/cases/getSkipSegmentsByHash.ts @@ -5,6 +5,7 @@ import {getHash} from '../../src/utils/getHash'; import {ImportMock,} from 'ts-mock-imports'; import * as YouTubeAPIModule from '../../src/utils/youtubeApi'; import {YouTubeApiMock} from '../youtubeMock'; +import assert from 'assert'; const mockManager = ImportMock.mockStaticClass(YouTubeAPIModule, 'YouTubeAPI'); const sinonStub = mockManager.mock('listVideos'); @@ -31,36 +32,35 @@ describe('getSegmentsByHash', () => { it('Should be able to get a 200', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/3272f?categories=["sponsor", "intro"]') .then(res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else done(); // pass + assert.strictEqual(res.status, 200); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 404 if no segments are found even if a video for the given hash is known', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/3272f?categories=["shilling"]') .then(async res => { - if (res.status !== 404) done("non 404 status code, was " + res.status); - else { - const body = await res.text(); - if (body === '[]') done(); // pass - else done("Response had videos"); - } + assert.strictEqual(res.status, 404); + const expected = '[]'; + const body = await res.text(); + assert.strictEqual(body, expected); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get an empty array if no videos', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/11111?categories=["shilling"]') .then(async res => { - if (res.status !== 404) done("non 404 status code, was " + res.status); - else { - const body = await res.text(); - if (JSON.parse(body).length === 0 && body === '[]') done(); // pass - else done("non empty array returned"); - } + assert.strictEqual(res.status, 404); + const body = await res.text(); + const expected = '[]'; + assert.strictEqual(JSON.parse(body).length, 0); + assert.strictEqual(body, expected); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get an empty array if only hidden videos', (done: Done) => { @@ -73,175 +73,159 @@ describe('getSegmentsByHash', () => { else done("non empty array returned"); } }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 400 prefix too short', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/11?categories=["shilling"]') .then(res => { - if (res.status !== 400) done("non 400 status code, was " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 400 prefix too long', (done: Done) => { - const prefix = new Array(50).join('1'); - if (prefix.length <= 32) { // default value, config can change this - done('failed to generate a long enough string for the test ' + prefix.length); - return; - } + const prefix = '1'.repeat(50); + assert.ok(prefix.length > 33, "failed to generate long enough string"); fetch(getbaseURL() + '/api/skipSegments/' + prefix + '?categories=["shilling"]') .then(res => { - if (res.status !== 400) done("non 400 status code, was " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); - it('Should not return 400 prefix in range', (done: Done) => { - fetch(getbaseURL() + '/api/skipSegments/11111?categories=["shilling"]') + it('Should return 404 prefix in range', (done: Done) => { + const prefix = '1'.repeat(5); + fetch(getbaseURL() + '/api/skipSegments/'+prefix+'?categories=["shilling"]') .then(res => { - if (res.status === 400) done("prefix length 5 gave 400 " + res.status); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 404 for no hash', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/?categories=["shilling"]') .then(res => { - if (res.status !== 404) done("expected 404, got " + res.status); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 400 for bad format categories', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/fdaf?categories=shilling') .then(res => { - if (res.status !== 400) done("expected 400 got " + res.status); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get multiple videos', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/fdaf?categories=["sponsor","intro"]') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 2) done("expected 2 videos, got " + body.length); - else if (body[0].segments.length !== 2) done("expected 2 segments for first video, got " + body[0].segments.length); - else if (body[1].segments.length !== 1) done("expected 1 segment for second video, got " + body[1].segments.length); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segments.length, 2); + assert.strictEqual(data[1].segments.length, 1); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get 200 for no categories (default sponsor)', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/fdaf') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 2) done("expected 2 videos, got " + body.length); - else if (body[0].segments.length !== 1) done("expected 1 segments for first video, got " + body[0].segments.length); - else if (body[1].segments.length !== 1) done("expected 1 segments for second video, got " + body[1].segments.length); - else if (body[0].segments[0].category !== 'sponsor' - || body[0].segments[0].UUID !== 'getSegmentsByHash-0-0' - || body[1].segments[0].category !== 'sponsor') done("both segments are not sponsor"); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segments.length, 1); + assert.strictEqual(data[1].segments.length, 1); + assert.strictEqual(data[0].segments[0].category, 'sponsor'); + assert.strictEqual(data[0].segments[0].UUID, 'getSegmentsByHash-0-0'); + assert.strictEqual(data[1].segments[0].category, 'sponsor'); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get 200 for no categories (default sponsor) with action type', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/fdaf?actionType=skip') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 2) done("expected 2 videos, got " + body.length); - else if (body[0].segments.length !== 1) done("expected 1 segments for first video, got " + body[0].segments.length); - else if (body[1].segments.length !== 1) done("expected 1 segments for second video, got " + body[1].segments.length); - else if (body[0].segments[0].category !== 'sponsor' - || body[0].segments[0].UUID !== 'getSegmentsByHash-0-0' - || body[1].segments[0].category !== 'sponsor') done("both segments are not sponsor"); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segments.length, 1); + assert.strictEqual(data[1].segments.length, 1); + assert.strictEqual(data[0].segments[0].category, 'sponsor'); + assert.strictEqual(data[0].segments[0].UUID, 'getSegmentsByHash-0-0'); + assert.strictEqual(data[1].segments[0].category, 'sponsor'); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get 200 for no categories (default sponsor) with multiple action types', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/fdaf?actionType=skip&actionType=mute') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 2) done("expected 2 videos, got " + body.length); - else if (body[0].segments.length !== 2) done("expected 2 segments for first video, got " + body[0].segments.length); - else if (body[1].segments.length !== 1) done("expected 1 segments for second video, got " + body[1].segments.length); - else if (body[0].segments[0].category !== 'sponsor' - || body[0].segments[0].UUID !== 'getSegmentsByHash-0-0' - || body[0].segments[1].UUID !== 'getSegmentsByHash-0-2' - || body[1].segments[0].category !== 'sponsor') done("both segments are not sponsor"); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segments.length, 2); + assert.strictEqual(data[1].segments.length, 1); + assert.strictEqual(data[0].segments[0].category, 'sponsor'); + assert.strictEqual(data[0].segments[0].UUID, 'getSegmentsByHash-0-0'); + assert.strictEqual(data[0].segments[1].UUID, 'getSegmentsByHash-0-2'); + assert.strictEqual(data[1].segments[0].category, 'sponsor'); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get 200 for no categories (default sponsor) with multiple action types (JSON array)', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/fdaf?actionTypes=["skip","mute"]') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 2) done("expected 2 videos, got " + body.length); - else if (body[0].segments.length !== 2) done("expected 2 segments for first video, got " + body[0].segments.length); - else if (body[1].segments.length !== 1) done("expected 1 segments for second video, got " + body[1].segments.length); - else if (body[0].segments[0].category !== 'sponsor' - || body[0].segments[0].UUID !== 'getSegmentsByHash-0-0' - || body[0].segments[1].UUID !== 'getSegmentsByHash-0-2' - || body[1].segments[0].category !== 'sponsor') done("both segments are not sponsor"); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 2); + assert.strictEqual(data[0].segments.length, 2); + assert.strictEqual(data[1].segments.length, 1); + assert.strictEqual(data[0].segments[0].category, 'sponsor'); + assert.strictEqual(data[0].segments[0].UUID, 'getSegmentsByHash-0-0'); + assert.strictEqual(data[0].segments[1].UUID, 'getSegmentsByHash-0-2'); + assert.strictEqual(data[1].segments[0].category, 'sponsor'); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get 200 for no categories (default sponsor) for a non YouTube service', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/fdaf?service=PeerTube') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 1) done("expected 1 video, got " + body.length); - else if (body[0].segments.length !== 1) done("expected 1 segments for first video, got " + body[0].segments.length); - else if (body[0].segments[0].UUID !== 'getSegmentsByHash-0-0-1') done("both segments are not sponsor"); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segments.length, 1); + assert.strictEqual(data[0].segments[0].UUID, 'getSegmentsByHash-0-0-1'); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should only return one segment when fetching highlight segments', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/c962?category=highlight') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 1) done("expected 1 video, got " + body.length); - else if (body[0].segments.length !== 1) done("expected 1 segment, got " + body[0].segments.length); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segments.length, 1); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to post a segment and get it using endpoint', (done: Done) => { @@ -260,23 +244,17 @@ describe('getSegmentsByHash', () => { }], }), }) - .then(async res => { - if (res.status === 200) { - fetch(getbaseURL() + '/api/skipSegments/' + getHash(testID, 1).substring(0, 3)) - .then(async res => { - if (res.status !== 200) done("(get) non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 1) done("(get) expected 1 video, got " + body.length); - else if (body[0].segments.length !== 1) done("(get) expected 1 segments for first video, got " + body[0].segments.length); - else if (body[0].segments[0].category !== 'sponsor') done("(get) segment should be sponsor, was " + body[0].segments[0].category); - else done(); - } - }) - .catch(() => done("(get) Couldn't call endpoint")); - } else { - done("(post) non 200 status code, was " + res.status); - } + .then(async () => { + fetch(getbaseURL() + '/api/skipSegments/' + getHash(testID, 1).substring(0, 3)) + .then(async res => { + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segments.length, 1); + assert.strictEqual(data[0].segments[0].category, 'sponsor'); + done(); + }) + .catch(err => done('(get) ' + err)); }) .catch(err => done('(post) ' + err)); }); @@ -284,64 +262,48 @@ describe('getSegmentsByHash', () => { it('Should be able to get multiple categories with repeating parameters', (done: Done) => { fetch(getbaseURL() + "/api/skipSegments/fdaff4?&category=sponsor&category=intro") .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const body = await res.json(); - if (body.length !== 1) done("expected 1 video, got " + body.length); - - const data = body[0].segments; - if (data.length === 2) { - let success = true; - for (const segment of data) { - if ((segment.segment[0] !== 1 || segment.segment[1] !== 10 - || segment.category !== "sponsor" || segment.UUID !== "getSegmentsByHash-0-0") && - (segment.segment[0] !== 20 || segment.segment[1] !== 30 - || segment.category !== "intro" || segment.UUID !== "getSegmentsByHash-0-1")) { - success = false; - break; - } - } - - if (success) done(); - else done("Received incorrect body: " + JSON.stringify(body)); - } else { - done("Received incorrect body: " + JSON.stringify(body)); - } - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segments[0].segment[0], 1); + assert.strictEqual(data[0].segments[0].segment[1], 10); + assert.strictEqual(data[0].segments[0].category, "sponsor"); + assert.strictEqual(data[0].segments[0].UUID, "getSegmentsByHash-0-0"); + assert.strictEqual(data[0].segments[1].segment[0], 20); + assert.strictEqual(data[0].segments[1].segment[1], 30); + assert.strictEqual(data[0].segments[1].category, "intro"); + assert.strictEqual(data[0].segments[1].UUID, "getSegmentsByHash-0-1"); + done(); }) - .catch(() => ("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get specific segments with requiredSegments', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/d518?requiredSegments=["requiredSegmentVid-2","requiredSegmentVid-3"]') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 1) done("expected 1 video, got " + body.length); - else if (body[0].segments.length !== 2) done("expected 2 segments for video, got " + body[0].segments.length); - else if (body[0].segments[0].UUID !== 'requiredSegmentVid-2' - || body[0].segments[1].UUID !== 'requiredSegmentVid-3') done("Did not recieve the correct segments\n" + JSON.stringify(body, null, 2)); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segments.length, 2); + assert.strictEqual(data[0].segments[0].UUID, 'requiredSegmentVid-2'); + assert.strictEqual(data[0].segments[0].UUID, 'requiredSegmentVid-2'); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get specific segments with repeating requiredSegment', (done: Done) => { fetch(getbaseURL() + '/api/skipSegments/d518?requiredSegment=requiredSegmentVid-2&requiredSegment=requiredSegmentVid-3') .then(async res => { - if (res.status !== 200) done("non 200 status code, was " + res.status); - else { - const body = await res.json(); - if (body.length !== 1) done("expected 1 video, got " + body.length); - else if (body[0].segments.length !== 2) done("expected 2 segments for video, got " + body[0].segments.length); - else if (body[0].segments[0].UUID !== 'requiredSegmentVid-2' - || body[0].segments[1].UUID !== 'requiredSegmentVid-3') done("Did not recieve the correct segments\n" + JSON.stringify(body, null, 2)); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.length, 1); + assert.strictEqual(data[0].segments.length, 2); + assert.strictEqual(data[0].segments[0].UUID, 'requiredSegmentVid-2'); + assert.strictEqual(data[0].segments[1].UUID, 'requiredSegmentVid-3'); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/getUserID.ts b/test/cases/getUserID.ts index e0c7c5a..64863f9 100644 --- a/test/cases/getUserID.ts +++ b/test/cases/getUserID.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {db} from '../../src/databases/databases'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('getUserID', () => { before(async () => { @@ -23,379 +24,293 @@ describe('getUserID', () => { it('Should be able to get a 200', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=fuzzy+user+01') .then(async res => { - if (res.status !== 200) done('non 200 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 200); + done(); }) - .catch(() => done('couldn\'t call endpoint')); + .catch(err => done(err)); }); it('Should be able to get a 400 (No username parameter)', (done: Done) => { fetch(getbaseURL() + '/api/userID') .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done('couldn\'t call endpoint')); + .catch(err => done(err)); }); it('Should be able to get a 200 (username is public id)', (done: Done) => { fetch(getbaseURL() + '/api/userID?username='+getHash("getuserid_user_06")) .then(async res => { - if (res.status !== 200) done('non 200 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 200); + done(); }) - .catch(() => done('couldn\'t call endpoint')); + .catch(err => done(err)); }); it('Should be able to get a 400 (username longer than 64 chars)', (done: Done) => { fetch(getbaseURL() + '/api/userID?username='+getHash("getuserid_user_06")+'0') .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done('couldn\'t call endpoint')); + .catch(err => done(err)); }); it('Should be able to get single username', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=fuzzy+user+01') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "fuzzy user 01") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_01")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "fuzzy user 01", + userID: getHash("getuserid_user_01") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get multiple fuzzy user info from start', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=fuzzy+user') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 2) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "fuzzy user 01") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_01")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else if (data[1].userName !== "fuzzy user 02") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[1].userID !== getHash("getuserid_user_02")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "fuzzy user 01", + userID: getHash("getuserid_user_01") + }, { + userName: "fuzzy user 02", + userID: getHash("getuserid_user_02") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get multiple fuzzy user info from middle', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=user') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 3) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "fuzzy user 01") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_01")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else if (data[1].userName !== "fuzzy user 02") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[1].userID !== getHash("getuserid_user_02")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else if (data[2].userName !== "specific user 03") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[2].userID !== getHash("getuserid_user_03")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "fuzzy user 01", + userID: getHash("getuserid_user_01") + }, { + userName: "fuzzy user 02", + userID: getHash("getuserid_user_02") + }, { + userName: "specific user 03", + userID: getHash("getuserid_user_03") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get with public ID', (done: Done) => { const userID = getHash("getuserid_user_06"); fetch(getbaseURL() + '/api/userID?username='+userID) .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== userID) { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== userID) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: userID, + userID + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get with fuzzy public ID', (done: Done) => { const userID = getHash("getuserid_user_06"); fetch(getbaseURL() + '/api/userID?username='+userID.substr(10,60)) .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== userID) { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== userID) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: userID, + userID + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get repeating username', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=repeating') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 2) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "repeating") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_04")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else if (data[1].userName !== "repeating") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[1].userID !== getHash("getuserid_user_05")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "repeating", + userID: getHash("getuserid_user_04") + }, { + userName: "repeating", + userID: getHash("getuserid_user_05") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get repeating fuzzy username', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=peat') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 2) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "repeating") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_04")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else if (data[1].userName !== "repeating") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[1].userID !== getHash("getuserid_user_05")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "repeating", + userID: getHash("getuserid_user_04") + }, { + userName: "repeating", + userID: getHash("getuserid_user_05") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should avoid ReDOS with _', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=_redos_') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "_redos_") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_09")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "_redos_", + userID: getHash("getuserid_user_09") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should avoid ReDOS with %', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=%redos%') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "%redos%") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_08")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "%redos%", + userID: getHash("getuserid_user_08") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return 404 if escaped backslashes present', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=%redos\\\\_') .then(res => { - if (res.status !== 404) done('non 404 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return 404 if backslashes present', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=\\%redos\\_') .then(res => { - if (res.status !== 404) done('non 404 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should return user if just backslashes', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=\\\\\\') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "\\\\\\") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_11")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "\\\\\\", + userID: getHash("getuserid_user_11") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should not allow usernames more than 64 characters', (done: Done) => { fetch(getbaseURL() + '/api/userID?username='+'0'.repeat(65)) .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should not allow usernames less than 3 characters', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=aa') .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('should allow exact match', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=a&exact=true') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 1) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "a") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_12")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "a", + userID: getHash("getuserid_user_12") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get repeating username with exact username', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=repeating&exact=true') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 2) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "repeating") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_04")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else if (data[1].userName !== "repeating") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[1].userID !== getHash("getuserid_user_05")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "repeating", + userID: getHash("getuserid_user_04") + }, { + userName: "repeating", + userID: getHash("getuserid_user_05") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should not get exact unless explicitly set to true', (done: Done) => { fetch(getbaseURL() + '/api/userID?username=user&exact=1') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.length !== 3) { - done('Returned incorrect number of users "' + data.length + '"'); - } else if (data[0].userName !== "fuzzy user 01") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[0].userID !== getHash("getuserid_user_01")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else if (data[1].userName !== "fuzzy user 02") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[1].userID !== getHash("getuserid_user_02")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else if (data[2].userName !== "specific user 03") { - done('Returned incorrect username "' + data.userName + '"'); - } else if (data[2].userID !== getHash("getuserid_user_03")) { - done('Returned incorrect userID "' + data.userID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = [{ + userName: "fuzzy user 01", + userID: getHash("getuserid_user_01") + }, { + userName: "fuzzy user 02", + userID: getHash("getuserid_user_02") + }, { + userName: "specific user 03", + userID: getHash("getuserid_user_03") + }]; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/getUserInfo.ts b/test/cases/getUserInfo.ts index 2c21250..eefb285 100644 --- a/test/cases/getUserInfo.ts +++ b/test/cases/getUserInfo.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {db} from '../../src/databases/databases'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('getUserInfo', () => { before(async () => { @@ -27,136 +28,109 @@ describe('getUserInfo', () => { it('Should be able to get a 200', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_user_01') .then(res => { - if (res.status !== 200) done('non 200 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 200); + done(); }) - .catch(() => done('couldn\'t call endpoint')); + .catch(err => done(err)); }); it('Should be able to get a 400 (No userID parameter)', (done: Done) => { fetch(getbaseURL() + '/api/userInfo') .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done('couldn\'t call endpoint')); + .catch(err => done(err)); }); it('Should be able to get user info', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_user_01') .then(async res => { - if (res.status !== 200) { - done("non 200"); - } else { - const data = await res.json(); - if (data.userName !== 'Username user 01') { - done('Returned incorrect userName "' + data.userName + '"'); - } else if (data.minutesSaved !== 5) { - done('Returned incorrect minutesSaved "' + data.minutesSaved + '"'); - } else if (data.viewCount !== 30) { - done('Returned incorrect viewCount "' + data.viewCount + '"'); - } else if (data.ignoredViewCount !== 20) { - done('Returned incorrect ignoredViewCount "' + data.ignoredViewCount + '"'); - } else if (data.segmentCount !== 3) { - done('Returned incorrect segmentCount "' + data.segmentCount + '"'); - } else if (data.ignoredSegmentCount !== 2) { - done('Returned incorrect ignoredSegmentCount "' + data.ignoredSegmentCount + '"'); - } else if (data.reputation !== -2) { - done('Returned incorrect reputation "' + data.reputation + '"'); - } else if (data.lastSegmentID !== "uuid000005") { - done('Returned incorrect last segment "' + data.lastSegmentID + '"'); - } else { - done(); // pass - } - } + assert.strictEqual(res.status, 200); + const expected = { + userName: 'Username user 01', + userID: "66e7c974039ffb870a500a33eca3a3989861018909b938c313cf1a8a366800b8", + minutesSaved: 5, + viewCount: 30, + ignoredViewCount: 20, + segmentCount: 3, + ignoredSegmentCount: 2, + reputation: -2, + lastSegmentID: "uuid000005", + vip: false, + warnings: 0 + }; + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should get warning data', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_warning_0') .then(async res => { - if (res.status !== 200) { - done('non 200 (' + res.status + ')'); - } else { - const data = await res.json(); - if (data.warnings !== 1) done('wrong number of warnings: ' + data.warnings + ', not ' + 1); - else done(); // pass - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.warnings, 1); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should get warning data with public ID', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?publicUserID=' + getHash("getuserinfo_warning_0")) .then(async res => { - if (res.status !== 200) { - done('non 200 (' + res.status + ')'); - } else { - const data = await res.json(); - if (data.warnings !== 1) done('wrong number of warnings: ' + data.warnings + ', not ' + 1); - else done(); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.warnings, 1); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should get multiple warnings', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_warning_1') .then(async res => { - if (res.status !== 200) { - done('non 200 (' + res.status + ')'); - } else { - const data = await res.json(); - if (data.warnings !== 2) done('wrong number of warnings: ' + data.warnings + ', not ' + 2); - else done(); // pass - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.warnings, 2); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should not get warnings if none', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_warning_2') .then(async res => { - if (res.status !== 200) { - done('non 200 (' + res.status + ')'); - } else { - const data = await res.json(); - if (data.warnings !== 0) done('wrong number of warnings: ' + data.warnings + ', not ' + 0); - else done(); // pass - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.warnings, 0); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should done(userID for userName (No userName set)', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_user_02') .then(async res => { - if (res.status !== 200) { - done('non 200 (' + res.status + ')'); - } else { - const data = await res.json(); - if (data.userName !== 'c2a28fd225e88f74945794ae85aef96001d4a1aaa1022c656f0dd48ac0a3ea0f') { - done('Did not done(userID for userName'); - } - done(); // pass - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.userName, 'c2a28fd225e88f74945794ae85aef96001d4a1aaa1022c656f0dd48ac0a3ea0f'); + done(); }) - .catch(() => ('couldn\'t call endpoint')); + .catch(err => done(err)); }); it('Should return null segment if none', (done: Done) => { fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_null') .then(async res => { - if (res.status !== 200) { - done('non 200 (' + res.status + ')'); - } else { - const data = await res.json(); - if (data.lastSegmentID !== null) done('returned segment ' + data.warnings + ', not ' + null); - else done(); // pass - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.lastSegmentID, null); + done(); }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return zeroes if userid does not exist', (done: Done) => { @@ -170,6 +144,6 @@ describe('getUserInfo', () => { } done(); // pass }) - .catch(() => ("couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/lockCategoriesRecords.ts b/test/cases/lockCategoriesRecords.ts index 2cb9070..6088154 100644 --- a/test/cases/lockCategoriesRecords.ts +++ b/test/cases/lockCategoriesRecords.ts @@ -2,7 +2,7 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {getHash} from '../../src/utils/getHash'; import {db} from '../../src/databases/databases'; - +import assert from 'assert'; describe('lockCategoriesRecords', () => { before(async () => { @@ -42,14 +42,12 @@ describe('lockCategoriesRecords', () => { 'intro', ], }; - const expected = { submitted: [ 'outro', 'shilling', ], }; - fetch(getbaseURL() + "/api/lockCategories", { method: 'POST', headers: { @@ -58,16 +56,10 @@ describe('lockCategoriesRecords', () => { body: JSON.stringify(json) }) .then(async res => { - if (res.status === 200) { - const data = await res.json(); - if (JSON.stringify(data) === JSON.stringify(expected)) { - done(); - } else { - done("Incorrect response: expected " + JSON.stringify(expected) + " got " + JSON.stringify(data)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) .catch(err => done(err)); }); @@ -85,7 +77,6 @@ describe('lockCategoriesRecords', () => { 'intro', ], }; - fetch(getbaseURL() + "/api/lockCategories", { method: 'POST', headers: { @@ -94,16 +85,10 @@ describe('lockCategoriesRecords', () => { body: JSON.stringify(json) }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['no-segments-video-id-1']); - if (result.length !== 4) { - done("Expected 4 entrys in db, got " + result.length); - } else { - done(); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['no-segments-video-id-1']); + assert.strictEqual(result.length, 4); + done(); }) .catch(err => done(err)); }); @@ -116,7 +101,6 @@ describe('lockCategoriesRecords', () => { 'word_word', ], }; - fetch(getbaseURL() + "/api/lockCategories", { method: 'POST', headers: { @@ -125,16 +109,10 @@ describe('lockCategoriesRecords', () => { body: JSON.stringify(json), }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['underscore']); - if (result.length !== 1) { - done("Expected 1 entrys in db, got " + result.length); - } else { - done(); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['underscore']); + assert.strictEqual(result.length, 1); + done(); }) .catch(err => done(err)); }); @@ -147,7 +125,6 @@ describe('lockCategoriesRecords', () => { 'wordWord', ], }; - fetch(getbaseURL() + "/api/lockCategories", { method: 'POST', headers: { @@ -156,16 +133,10 @@ describe('lockCategoriesRecords', () => { body: JSON.stringify(json), }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['bothCases']); - if (result.length !== 1) { - done("Expected 1 entrys in db, got " + result.length); - } else { - done(); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['bothCases']); + assert.strictEqual(result.length, 1); + done(); }) .catch(err => done(err)); }); @@ -187,16 +158,10 @@ describe('lockCategoriesRecords', () => { body: JSON.stringify(json), }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['specialChar']); - if (result.length !== 0) { - done("Expected 0 entrys in db, got " + result.length); - } else { - done(); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['specialChar']); + assert.strictEqual(result.length, 0); + done(); }) .catch(err => done(err)); }); @@ -209,12 +174,9 @@ describe('lockCategoriesRecords', () => { }, body: JSON.stringify({}), }) - .then(async res => { - if (res.status === 400) { - done(); - } else { - done("Status code was " + res.status); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); @@ -225,7 +187,6 @@ describe('lockCategoriesRecords', () => { userID: 'test', categories: [], }; - fetch(getbaseURL() + "/api/lockCategories", { method: 'POST', headers: { @@ -233,12 +194,9 @@ describe('lockCategoriesRecords', () => { }, body: JSON.stringify(json), }) - .then(async res => { - if (res.status === 400) { - done(); - } else { - done("Status code was " + res.status); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); @@ -257,12 +215,9 @@ describe('lockCategoriesRecords', () => { }, body: JSON.stringify(json), }) - .then(async res => { - if (res.status === 400) { - done(); - } else { - done("Status code was " + res.status); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); @@ -281,12 +236,9 @@ describe('lockCategoriesRecords', () => { }, body: JSON.stringify(json), }) - .then(async res => { - if (res.status === 400) { - done(); - } else { - done("Status code was " + res.status); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); @@ -305,12 +257,9 @@ describe('lockCategoriesRecords', () => { }, body: JSON.stringify(json), }) - .then(async res => { - if (res.status === 400) { - done(); - } else { - done("Status code was " + res.status); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); @@ -329,12 +278,9 @@ describe('lockCategoriesRecords', () => { }, body: JSON.stringify(json), }) - .then(async res => { - if (res.status === 400) { - done(); - } else { - done("Status code was " + res.status); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); @@ -355,12 +301,9 @@ describe('lockCategoriesRecords', () => { }, body: JSON.stringify(json), }) - .then(async res => { - if (res.status === 403) { - done(); - } else { - done("Status code was " + res.status); - } + .then(res => { + assert.strictEqual(res.status, 403); + done(); }) .catch(err => done(err)); }); @@ -382,16 +325,10 @@ describe('lockCategoriesRecords', () => { body: JSON.stringify(json), }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['delete-record']); - if (result.length === 0) { - done(); - } else { - done("Didn't delete record"); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['delete-record']); + assert.strictEqual(result.length, 0); + done(); }) .catch(err => done(err)); }); @@ -413,16 +350,10 @@ describe('lockCategoriesRecords', () => { body: JSON.stringify(json), }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['delete-record-1']); - if (result.length === 1) { - done(); - } else { - done("Didn't delete record"); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['delete-record-1']); + assert.strictEqual(result.length, 1); + done(); }) .catch(err => done(err)); }); @@ -449,11 +380,8 @@ describe('lockCategoriesRecords', () => { }), }) .then(async res => { - if (res.status === 403) { - done(); - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 403); + done(); }) .catch(err => done(err)); }); @@ -477,11 +405,8 @@ describe('lockCategoriesRecords', () => { },), }) .then(async res => { - if (res.status === 403) { - done(); - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 403); + done(); }) .catch(err => done(err)); }); @@ -503,11 +428,8 @@ describe('lockCategoriesRecords', () => { }), }) .then(async res => { - if (res.status === 200) { - done(); - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + done(); }) .catch(err => done(err)); }); @@ -528,11 +450,8 @@ describe('lockCategoriesRecords', () => { }), }) .then(async res => { - if (res.status === 200) { - done(); - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + done(); }) .catch(err => done(err)); }); @@ -549,29 +468,11 @@ describe('lockCategoriesRecords', () => { fetch(getbaseURL() + "/api/lockCategories?videoID=" + "no-segments-video-id") .then(async res => { - if (res.status === 200) { - const data = await res.json(); - if (JSON.stringify(data) === JSON.stringify(expected)) { - done(); - } else { - done("Incorrect response: expected " + JSON.stringify(expected) + " got " + JSON.stringify(data)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.deepStrictEqual(data, expected); + done(); }) .catch(err => done(err)); }); - - it('Should be able to get hashedVideoID from lock', (done: Done) => { - const hashedVideoID = getHash('no-segments-video-id', 1); - db.prepare('get', 'SELECT "hashedVideoID" FROM "lockCategories" WHERE "videoID" = ?', ['no-segments-video-id']) - .then(result => { - if (result !== hashedVideoID) { - done(); - } else { - done("Got unexpected video hash " + result); - } - }); - }); }); diff --git a/test/cases/oldGetSponsorTime.ts b/test/cases/oldGetSponsorTime.ts index 9a19fa2..cbd5e65 100644 --- a/test/cases/oldGetSponsorTime.ts +++ b/test/cases/oldGetSponsorTime.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {db} from '../../src/databases/databases'; import {Done, getbaseURL} from '../utils'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('getVideoSponsorTime (Old get method)', () => { before(async () => { @@ -13,27 +14,27 @@ describe('getVideoSponsorTime (Old get method)', () => { it('Should be able to get a time', (done: Done) => { fetch(getbaseURL() + "/api/getVideoSponsorTimes?videoID=old-testtesttest") .then(res => { - if (res.status !== 200) done("non 200 (" + res.status + ")"); - else done(); // pass + assert.strictEqual(res.status, 200); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should return 404 if no segment found', (done: Done) => { fetch(getbaseURL() + "/api/getVideoSponsorTimes?videoID=notarealvideo") .then(res => { - if (res.status !== 404) done("non 404 respone code: " + res.status); - else done(); // pass + assert.strictEqual(res.status, 404); + done(); }) - .catch(() => done("couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be possible to send unexpected query parameters', (done: Done) => { fetch(getbaseURL() + "/api/getVideoSponsorTimes?videoID=old-testtesttest&fakeparam=hello") .then(res => { - if (res.status !== 200) done("non 200"); - else done(); // pass + assert.strictEqual(res.status, 200); + done(); }) .catch(() => done("couldn't callendpoint")); }); @@ -41,30 +42,24 @@ describe('getVideoSponsorTime (Old get method)', () => { it('Should be able send a comma in a query param', (done: Done) => { fetch(getbaseURL() + "/api/getVideoSponsorTimes?videoID=old-testtesttest,test") .then(async res => { - const body = await res.text(); - if (res.status !== 200) done("non 200 response: " + res.status); - else if (JSON.parse(body).UUIDs[0] === 'uuid-1') done(); // pass - else done("couldn't parse response"); + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.UUIDs[0], "uuid-1"); + done(); }) - .catch(() => done("couln't call endpoint")); + .catch(err => done(err)); }); it('Should be able to get the correct time', (done: Done) => { fetch(getbaseURL() + "/api/getVideoSponsorTimes?videoID=old-testtesttest") .then(async res => { - if (res.status !== 200) done("non 200"); - else { - const parsedBody = await res.json(); - if (parsedBody.sponsorTimes[0][0] === 1 - && parsedBody.sponsorTimes[0][1] === 11 - && parsedBody.UUIDs[0] === 'uuid-0') { - done(); // pass - } else { - done("Wrong data was returned + " + JSON.stringify(parsedBody)); - } - } - + assert.strictEqual(res.status, 200); + const data = await res.json(); + assert.strictEqual(data.sponsorTimes[0][0], 1); + assert.strictEqual(data.sponsorTimes[0][1], 11); + assert.strictEqual(data.UUIDs[0], 'uuid-0'); + done(); }) - .catch(() => done("couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/oldSubmitSponsorTimes.ts b/test/cases/oldSubmitSponsorTimes.ts index 746f7f3..68ca032 100644 --- a/test/cases/oldSubmitSponsorTimes.ts +++ b/test/cases/oldSubmitSponsorTimes.ts @@ -1,23 +1,19 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {db} from '../../src/databases/databases'; - +import assert from 'assert'; describe('postVideoSponsorTime (Old submission method)', () => { it('Should be able to submit a time (GET)', (done: Done) => { fetch(getbaseURL() + "/api/postVideoSponsorTimes?videoID=dQw4w9WgXcQ&startTime=1&endTime=10&userID=testtesttesttesttesttesttesttesttest") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcQ"]); - if (row.startTime === 1 && row.endTime === 10 && row.category === "sponsor") { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcQ"]); + assert.strictEqual(row.startTime, 1); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -31,16 +27,12 @@ describe('postVideoSponsorTime (Old submission method)', () => { }, }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcE"]); - if (row.startTime === 1 && row.endTime === 11 && row.category === "sponsor") { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcE"]); + assert.strictEqual(row.startTime, 1); + assert.strictEqual(row.endTime, 11); + assert.strictEqual(row.category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -49,8 +41,8 @@ describe('postVideoSponsorTime (Old submission method)', () => { fetch(getbaseURL() + "/api/postVideoSponsorTimes?startTime=1&endTime=10&userID=testtesttesttesttesttesttesttesttest") .then(async res => { - if (res.status === 400) done(); - else done("Status code was: " + res.status); + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); diff --git a/test/cases/postClearCache.ts b/test/cases/postClearCache.ts index 9a21a4e..3e976e5 100644 --- a/test/cases/postClearCache.ts +++ b/test/cases/postClearCache.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {db} from '../../src/databases/databases'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('postClearCache', () => { before(async () => { @@ -16,8 +17,8 @@ describe('postClearCache', () => { method: 'POST' }) .then(res => { - if (res.status === 200) done(); - else done("Status code was " + res.status); + assert.strictEqual(res.status, 200); + done(); }) .catch(err => done(err)); }); @@ -28,8 +29,8 @@ describe('postClearCache', () => { method: 'POST' }) .then(res => { - if (res.status === 200) done(); - else done("Status code was " + res.status); + assert.strictEqual(res.status, 200); + done(); }) .catch(err => done(err)); }); @@ -40,8 +41,8 @@ describe('postClearCache', () => { method: 'POST' }) .then(async res => { - if (res.status !== 403) done('non 403 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 403); + done(); }) .catch(err => done(err)); }); @@ -52,8 +53,8 @@ describe('postClearCache', () => { method: 'POST' }) .then(async res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); @@ -64,8 +65,8 @@ describe('postClearCache', () => { method: 'POST' }) .then(async res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); diff --git a/test/cases/postPurgeAllSegments.ts b/test/cases/postPurgeAllSegments.ts index a907ddc..a900893 100644 --- a/test/cases/postPurgeAllSegments.ts +++ b/test/cases/postPurgeAllSegments.ts @@ -3,6 +3,7 @@ import {Done, getbaseURL} from '../utils'; import {db} from '../../src/databases/databases'; import {getHash} from '../../src/utils/getHash'; import {IDatabase} from '../../src/databases/IDatabase'; +import assert from 'assert'; async function dbSponsorTimesAdd(db: IDatabase, videoID: string, startTime: number, endTime: number, UUID: string, category: string) { const votes = 0, @@ -57,7 +58,8 @@ describe('postPurgeAllSegments', function () { }), }) .then(async res => { - done(res.status === 403 ? undefined : res.status); + assert.strictEqual(res.status, 403); + done(); }) .catch(err => done(err)); }); @@ -74,7 +76,7 @@ describe('postPurgeAllSegments', function () { }), }) .then(async res => { - if (res.status !== 200) return done(`Status code was ${res.status}`); + assert.strictEqual(res.status, 200); done(await dbSponsorTimesCompareExpect(db, 'vsegpurge01', 1) || await dbSponsorTimesCompareExpect(db, 'vseg-not-purged01', 0)); }) .catch(err => done(err)); diff --git a/test/cases/postSkipSegments.ts b/test/cases/postSkipSegments.ts index 88e2b75..614c9a7 100644 --- a/test/cases/postSkipSegments.ts +++ b/test/cases/postSkipSegments.ts @@ -6,6 +6,7 @@ import {db} from '../../src/databases/databases'; import {ImportMock} from 'ts-mock-imports'; import * as YouTubeAPIModule from '../../src/utils/youtubeApi'; import {YouTubeApiMock} from '../youtubeMock'; +import assert from 'assert'; const mockManager = ImportMock.mockStaticClass(YouTubeAPIModule, 'YouTubeAPI'); const sinonStub = mockManager.mock('listVideos'); @@ -62,16 +63,12 @@ describe('postSkipSegments', () => { }, }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcR"]); - if (row.startTime === 2 && row.endTime === 10 && row.category === "sponsor") { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcR"]); + assert.strictEqual(row.startTime, 2); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -93,16 +90,13 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcF"]); - if (row.startTime === 0 && row.endTime === 10 && row.locked === 0 && row.category === "sponsor") { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcF"]); + assert.strictEqual(row.startTime, 0); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.locked, 0); + assert.strictEqual(row.category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -125,16 +119,14 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "actionType" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcV"]); - if (row.startTime === 0 && row.endTime === 10 && row.locked === 0 && row.category === "sponsor" && row.actionType === "mute") { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "actionType" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcV"]); + assert.strictEqual(row.startTime, 0); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.locked, 0); + assert.strictEqual(row.category, "sponsor"); + assert.strictEqual(row.actionType, "mute"); + done(); }) .catch(err => done(err)); }); @@ -157,16 +149,14 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXZX"]); - if (row.startTime === 0 && row.endTime === 10 && row.locked === 0 && row.category === "sponsor" && row.videoDuration === 4980) { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXZX"]); + assert.strictEqual(row.startTime, 0); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.locked, 0); + assert.strictEqual(row.category, "sponsor"); + assert.strictEqual(row.videoDuration, 4980); + done(); }) .catch(err => done(err)); }); @@ -189,16 +179,14 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXZH"]); - if (row.startTime === 1 && row.endTime === 10 && row.locked === 0 && row.category === "sponsor" && row.videoDuration === 4980.20) { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXZH"]); + assert.strictEqual(row.startTime, 1); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.locked, 0); + assert.strictEqual(row.category, "sponsor"); + assert.strictEqual(row.videoDuration, 4980.20); + done(); }) .catch(err => done(err)); }); @@ -221,16 +209,14 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["noDuration"]); - if (row.startTime === 0 && row.endTime === 10 && row.locked === 0 && row.category === "sponsor" && row.videoDuration === 100) { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" FROM "sponsorTimes" WHERE "videoID" = ?`, ["noDuration"]); + assert.strictEqual(row.startTime, 0); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.locked, 0); + assert.strictEqual(row.category, "sponsor"); + assert.strictEqual(row.videoDuration, 100); + done(); }) .catch(err => done(err)); }); @@ -256,23 +242,21 @@ describe('postSkipSegments', () => { }], }), }); - - if (res.status === 200) { - const lockCategoriesRow = await db.prepare('get', `SELECT * from "lockCategories" WHERE videoID = ?`, ["noDuration"]); - const videoRows = await db.prepare('all', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" - FROM "sponsorTimes" WHERE "videoID" = ? AND hidden = 0`, ["noDuration"]); - const videoRow = videoRows[0]; - const hiddenVideoRows = await db.prepare('all', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" - FROM "sponsorTimes" WHERE "videoID" = ? AND hidden = 1`, ["noDuration"]); - if (lockCategoriesRow === undefined && videoRows.length === 1 && hiddenVideoRows.length === 1 && videoRow.startTime === 1 && videoRow.endTime === 10 - && videoRow.locked === 0 && videoRow.category === "sponsor" && videoRow.videoDuration === 100) { - return; - } else { - return "Submitted times were not saved. Actual submission: " + JSON.stringify(videoRow); - } - } else { - return "Status code was " + res.status; - } + assert.strictEqual(res.status, 200); + const lockCategoriesRow = await db.prepare('get', `SELECT * from "lockCategories" WHERE videoID = ?`, ["noDuration"]); + const videoRows = await db.prepare('all', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" + FROM "sponsorTimes" WHERE "videoID" = ? AND hidden = 0`, ["noDuration"]); + const videoRow = videoRows[0]; + const hiddenVideoRows = await db.prepare('all', `SELECT "startTime", "endTime", "locked", "category", "videoDuration" + FROM "sponsorTimes" WHERE "videoID" = ? AND hidden = 1`, ["noDuration"]); + assert.ok(!lockCategoriesRow); + assert.strictEqual(videoRows.length, 1); + assert.strictEqual(hiddenVideoRows.length, 1); + assert.strictEqual(videoRow.startTime, 1); + assert.strictEqual(videoRow.endTime, 10); + assert.strictEqual(videoRow.locked, 0); + assert.strictEqual(videoRow.category, "sponsor"); + assert.strictEqual(videoRow.videoDuration, 100); } catch (e) { return e; } @@ -284,13 +268,10 @@ describe('postSkipSegments', () => { method: 'POST', }) .then(async res => { - if (res.status === 403) done(); // pass - else { - const body = await res.text(); - done("non 403 status code: " + res.status + " (" + body + ")"); - } + assert.strictEqual(res.status, 403); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to submit a single time under a different service (JSON method)', (done: Done) => { @@ -311,16 +292,14 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "service" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcG"]); - if (row.startTime === 0 && row.endTime === 10 && row.locked === 0 && row.category === "sponsor" && row.service === "PeerTube") { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category", "service" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcG"]); + assert.strictEqual(row.startTime, 0); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.locked, 0); + assert.strictEqual(row.category, "sponsor"); + assert.strictEqual(row.service, "PeerTube"); + done(); }) .catch(err => done(err)); }); @@ -342,16 +321,13 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["vipuserIDSubmission"]); - if (row.startTime === 0 && row.endTime === 10 && row.locked === 1 && row.category === "sponsor") { - done(); - } else { - done("Submitted times were not saved. Actual submission: " + JSON.stringify(row)); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "startTime", "endTime", "locked", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["vipuserIDSubmission"]); + assert.strictEqual(row.startTime, 0); + assert.strictEqual(row.endTime, 10); + assert.strictEqual(row.locked, 1); + assert.strictEqual(row.category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -365,7 +341,7 @@ describe('postSkipSegments', () => { }, body: JSON.stringify({ userID: "testtesttesttesttesttesttesttesttest", - videoID: "dQw4w9WgXcQ", + videoID: "dQw4w9WgXcT", segments: [{ segment: [3, 10], category: "sponsor", @@ -376,23 +352,19 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const rows = await db.prepare('all', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcR"]); - let success = true; - if (rows.length === 2) { - for (const row of rows) { - if ((row.startTime !== 3 || row.endTime !== 10 || row.category !== "sponsor") && - (row.startTime !== 30 || row.endTime !== 60 || row.category !== "intro")) { - success = false; - break; - } - } - } - if (success) done(); - else done("Submitted times were not saved. Actual submissions: " + JSON.stringify(rows)); - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const rows = await db.prepare('all', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcT"]); + const expected = [{ + startTime: 3, + endTime: 10, + category: "sponsor" + }, { + startTime: 30, + endTime: 60, + category: "intro" + }]; + assert.deepStrictEqual(rows, expected); + done(); }) .catch(err => done(err)); }).timeout(5000); @@ -423,25 +395,27 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 200) { - const rows = await db.prepare('all', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["L_jWHffIx5E"]); - let success = true; - if (rows.length === 4) { - for (const row of rows) { - if ((row.startTime !== 3 || row.endTime !== 3000 || row.category !== "sponsor") && - (row.startTime !== 3002 || row.endTime !== 3050 || row.category !== "intro") && - (row.startTime !== 45 || row.endTime !== 100 || row.category !== "interaction") && - (row.startTime !== 99 || row.endTime !== 170 || row.category !== "sponsor")) { - success = false; - break; - } - } - } - if (success) done(); - else done("Submitted times were not saved. Actual submissions: " + JSON.stringify(rows)); - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const rows = await db.prepare('all', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["L_jWHffIx5E"]); + const expected = [{ + startTime: 3, + endTime: 3000, + category: "sponsor" + }, { + startTime: 3002, + endTime: 3050, + category: "intro" + }, { + startTime: 45, + endTime: 100, + category: "interaction" + }, { + startTime: 99, + endTime: 170, + category: "sponsor" + }]; + assert.deepStrictEqual(rows, expected); + done(); }) .catch(err => done(err)); }).timeout(5000); @@ -472,27 +446,10 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 403) { - const rows = await db.prepare('all', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["n9rIGdXnSJc"]); - let success = true; - if (rows.length === 4) { - for (const row of rows) { - if ((row.startTime === 0 || row.endTime === 2000 || row.category === "interaction") || - (row.startTime === 3000 || row.endTime === 4000 || row.category === "sponsor") || - (row.startTime === 1500 || row.endTime === 2750 || row.category === "sponsor") || - (row.startTime === 4050 || row.endTime === 4750 || row.category === "intro")) { - success = false; - break; - } - } - } - - if (success) done(); - else - done("Submitted times were not saved. Actual submissions: " + JSON.stringify(rows)); - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 403); + const rows = await db.prepare('all', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["n9rIGdXnSJc"]); + assert.deepStrictEqual(rows, []); + done(); }) .catch(err => done(err)); }).timeout(5000); @@ -520,23 +477,23 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 403) { - const rows = await db.prepare('all', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["80percent_video"]); - let success = rows.length == 2; - for (const row of rows) { - if ((row.startTime === 2000 || row.endTime === 4000 || row.category === "sponsor") || - (row.startTime === 1500 || row.endTime === 2750 || row.category === "sponsor") || - (row.startTime === 4050 || row.endTime === 4750 || row.category === "sponsor")) { - success = false; - break; - } - } - if (success) done(); - else - done("Submitted times were not saved. Actual submissions: " + JSON.stringify(rows)); - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 403); + const expected = [{ + category: "sponsor", + startTime: 2000, + endTime: 4000 + }, { + category: "sponsor", + startTime: 1500, + endTime: 2750 + }, { + category: "sponsor", + startTime: 4050, + endTime: 4750 + }]; + const rows = await db.prepare('all', `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ? and "votes" > -1`, ["80percent_video"]); + assert.notDeepStrictEqual(rows, expected); + done(); }) .catch(err => done(err)); }).timeout(5000); @@ -546,14 +503,11 @@ describe('postSkipSegments', () => { + "/api/skipSegments?videoID=qqwerty&startTime=30&endTime=30.5&userID=testtesttesttesttesttesttesttesttesting&category=intro", { method: 'POST', }) - .then(async res => { - if (res.status === 200) done(); // pass - else { - const body = await res.text(); - done("non 200 status code: " + res.status + " (" + body + ")"); - } + .then(res => { + assert.strictEqual(res.status, 200); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be rejected if segment starts and ends at the same time', (done: Done) => { @@ -561,14 +515,11 @@ describe('postSkipSegments', () => { + "/api/skipSegments?videoID=qqwerty&startTime=90&endTime=90&userID=testtesttesttesttesttesttesttesttesting&category=intro", { method: 'POST', }) - .then(async res => { - if (res.status === 400) done(); // pass - else { - const body = await res.text(); - done("non 400 status code: " + res.status + " (" + body + ")"); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be accepted if highlight segment starts and ends at the same time', (done: Done) => { @@ -576,14 +527,11 @@ describe('postSkipSegments', () => { + "/api/skipSegments?videoID=qqwerty&startTime=30&endTime=30&userID=testtesttesttesttesttesttesttesttesting&category=highlight", { method: 'POST', }) - .then(async res => { - if (res.status === 200) done(); // pass - else { - const body = await res.text(); - done("non 200 status code: " + res.status + " (" + body + ")"); - } + .then(res => { + assert.strictEqual(res.status, 200); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be rejected if highlight segment doesn\'t start and end at the same time', (done: Done) => { @@ -591,14 +539,11 @@ describe('postSkipSegments', () => { + "/api/skipSegments?videoID=qqwerty&startTime=30&endTime=30.5&userID=testtesttesttesttesttesttesttesttesting&category=highlight", { method: 'POST', }) - .then(async res => { - if (res.status === 400) done(); // pass - else { - const body = await res.text(); - done("non 400 status code: " + res.status + " (" + body + ")"); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be rejected if a sponsor is less than 1 second', (done: Done) => { @@ -606,40 +551,31 @@ describe('postSkipSegments', () => { + "/api/skipSegments?videoID=qqwerty&startTime=30&endTime=30.5&userID=testtesttesttesttesttesttesttesttesting", { method: 'POST', }) - .then(async res => { - if (res.status === 400) done(); // pass - else { - const body = await res.text(); - done("non 403 status code: " + res.status + " (" + body + ")"); - } + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be rejected if over 80% of the video', (done: Done) => { fetch(getbaseURL() + "/api/postVideoSponsorTimes?videoID=qqwerty&startTime=30&endTime=1000000&userID=testtesttesttesttesttesttesttesttesting") - .then(async res => { - if (res.status === 403) done(); // pass - else { - const body = await res.text(); - done("non 403 status code: " + res.status + " (" + body + ")"); - } + .then(res => { + assert.strictEqual(res.status, 403); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it("Should be rejected if NB's predicted probability is <70%.", (done: Done) => { fetch(getbaseURL() + "/api/postVideoSponsorTimes?videoID=LevkAjUE6d4&startTime=40&endTime=60&userID=testtesttesttesttesttesttesttesttesting") - .then(async res => { - if (res.status === 200) done(); // pass - else { - const body = await res.text(); - done("non 200 status code: " + res.status + " (" + body + ")"); - } + .then(res => { + assert.strictEqual(res.status, 200); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be rejected with custom message if user has to many active warnings', (done: Done) => { @@ -659,16 +595,10 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 403) { - const errorMessage = await res.text(); - if (errorMessage === 'Reason01') { - done(); // success - } else { - done("Status code was 403 but message was: " + errorMessage); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 403); + const errorMessage = await res.text(); + assert.strictEqual(errorMessage, 'Reason01'); + done(); }) .catch(err => done(err)); }); @@ -736,7 +666,7 @@ describe('postSkipSegments', () => { if (res.status === 400) done(); else done(true); }) - .catch(() => done(true)); + .catch(err => done(err)); }); it('Should be rejected with default message if user has to many active warnings', (done: Done) => { @@ -756,16 +686,10 @@ describe('postSkipSegments', () => { }), }) .then(async res => { - if (res.status === 403) { - const errorMessage = await res.text(); - if (errorMessage !== '') { - done(); // success - } else { - done("Status code was 403 but message was: " + errorMessage); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 403); + const errorMessage = await res.text(); + assert.notStrictEqual(errorMessage, ''); + done(); }) .catch(err => done(err)); }); @@ -788,11 +712,11 @@ describe('postSkipSegments', () => { }], }), }) - .then(async res => { - if (res.status === 400) done(); - else done(true); + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done(true)); + .catch(err => done(err)); }); it('Should return 400 for missing params (JSON method) 2', (done: Done) => { fetch(getbaseURL() @@ -806,11 +730,11 @@ describe('postSkipSegments', () => { videoID: "dQw4w9WgXcQ", }), }) - .then(async res => { - if (res.status === 400) done(); - else done(true); + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done(true)); + .catch(err => done(err)); }); it('Should return 400 for missing params (JSON method) 3', (done: Done) => { fetch(getbaseURL() @@ -831,11 +755,11 @@ describe('postSkipSegments', () => { }], }), }) - .then(async res => { - if (res.status === 400) done(); - else done(true); + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done(true)); + .catch(err => done(err)); }); it('Should return 400 for missing params (JSON method) 4', (done: Done) => { fetch(getbaseURL() @@ -855,11 +779,11 @@ describe('postSkipSegments', () => { }], }), }) - .then(async res => { - if (res.status === 400) done(); - else done(true); + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done(true)); + .catch(err => done(err)); }); it('Should return 400 for missing params (JSON method) 5', (done: Done) => { fetch(getbaseURL() @@ -873,10 +797,10 @@ describe('postSkipSegments', () => { videoID: "dQw4w9WgXcQ", }), }) - .then(async res => { - if (res.status === 400) done(); - else done(true); + .then(res => { + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done(true)); + .catch(err => done(err)); }); }); diff --git a/test/cases/postWarning.ts b/test/cases/postWarning.ts index 8231148..0e6d3dc 100644 --- a/test/cases/postWarning.ts +++ b/test/cases/postWarning.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {Done, getbaseURL} from '../utils'; import {db} from '../../src/databases/databases'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('postWarning', () => { before(async () => { @@ -23,18 +24,12 @@ describe('postWarning', () => { body: JSON.stringify(json), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled, "reason" FROM warnings WHERE "userID" = ?`, [json.userID]); - if (row?.enabled == 1 && row?.issuerUserID == getHash(json.issuerUserID) && row?.reason === json.reason) { - done(); - } else { - done("Warning missing from database"); - } - } else { - const body = await res.text(); - console.log(body); - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled, "reason" FROM warnings WHERE "userID" = ?`, [json.userID]); + assert.strictEqual(row.enabled, 1); + assert.strictEqual(row.issuerUserID, getHash(json.issuerUserID)); + assert.strictEqual(row.reason, json.reason); + done(); }) .catch(err => done(err)); }); @@ -54,18 +49,11 @@ describe('postWarning', () => { body: JSON.stringify(json), }) .then(async res => { - if (res.status === 409) { - const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]); - if (row?.enabled == 1 && row?.issuerUserID == getHash(json.issuerUserID)) { - done(); - } else { - done("Warning missing from database"); - } - } else { - const body = await res.text(); - console.log(body); - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 409); + const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]); + assert.strictEqual(row.enabled, 1); + assert.strictEqual(row.issuerUserID, getHash(json.issuerUserID)); + done(); }) .catch(err => done(err)); }); @@ -86,18 +74,10 @@ describe('postWarning', () => { body: JSON.stringify(json), }) .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]); - if (row?.enabled == 0) { - done(); - } else { - done("Warning missing from database"); - } - } else { - const body = await res.text(); - console.log(body); - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]); + assert.strictEqual(row.enabled, 0); + done(); }) .catch(err => done(err)); }); @@ -116,14 +96,9 @@ describe('postWarning', () => { }, body: JSON.stringify(json), }) - .then(async res => { - if (res.status === 403) { - done(); - } else { - const body = await res.text(); - console.log(body); - done("Status code was " + res.status); - } + .then(res => { + assert.strictEqual(res.status, 403); + done(); }) .catch(err => done(err)); }); diff --git a/test/cases/segmentShift.ts b/test/cases/segmentShift.ts index 4a0cae6..db5ad98 100644 --- a/test/cases/segmentShift.ts +++ b/test/cases/segmentShift.ts @@ -3,6 +3,7 @@ import {Done, getbaseURL} from '../utils'; import {db} from '../../src/databases/databases'; import {getHash} from '../../src/utils/getHash'; import {IDatabase} from '../../src/databases/IDatabase'; +import assert from 'assert'; async function dbSponsorTimesAdd(db: IDatabase, videoID: string, startTime: number, endTime: number, UUID: string, category: string) { const votes = 0, @@ -22,25 +23,18 @@ async function dbSponsorTimesSetByUUID(db: IDatabase, UUID: string, startTime: n await db.prepare('run', `UPDATE "sponsorTimes" SET "startTime" = ?, "endTime" = ? WHERE "UUID" = ?`, [startTime, endTime, UUID]); } -async function dbSponsorTimesCompareExpect(db: IDatabase, expect: any) { +async function dbSponsorTimesCompareExpect(db: IDatabase, expect: any): Promise { for (let i = 0, len = expect.length; i < len; i++) { const expectSeg = expect[i]; const seg = await db.prepare('get', `SELECT "startTime", "endTime" FROM "sponsorTimes" WHERE "UUID" = ?`, [expectSeg.UUID]); if ('removed' in expect) { - if (expect.removed === true && seg.votes === -2) { - return; - } else { - return `${expectSeg.UUID} doesnt got removed`; - } - } - if (seg.startTime !== expectSeg.startTime) { - return `${expectSeg.UUID} startTime is incorrect. seg.startTime is ${seg.startTime} expected ${expectSeg.startTime}`; - } - if (seg.endTime !== expectSeg.endTime) { - return `${expectSeg.UUID} endTime is incorrect. seg.endTime is ${seg.endTime} expected ${expectSeg.endTime}`; + assert.ok(expect.removed); + assert.strictEqual(seg.votes, -2); + assert.deepStrictEqual(seg, expectSeg); + assert.strictEqual(seg.startTime, expectSeg.startTime); + assert.strictEqual(seg.endTime, expectSeg.endTime); } } - return; } describe('segmentShift', function () { @@ -79,7 +73,8 @@ describe('segmentShift', function () { }), }) .then(async res => { - done(res.status === 403 ? undefined : res.status); + assert.strictEqual(res.status, 403); + done(); }) .catch(err => done(err)); }); @@ -98,7 +93,7 @@ describe('segmentShift', function () { }), }) .then(async res => { - if (res.status !== 200) return done(`Status code was ${res.status}`); + assert.strictEqual(res.status, 200); const expect = [ { UUID: 'vsegshifttest01uuid01', @@ -140,7 +135,7 @@ describe('segmentShift', function () { }), }) .then(async res => { - if (res.status !== 200) return done(`Status code was ${res.status}`); + assert.strictEqual(res.status, 200); const expect = [ { UUID: 'vsegshifttest01uuid01', @@ -182,7 +177,7 @@ describe('segmentShift', function () { }), }) .then(async res => { - if (res.status !== 200) return done(`Status code was ${res.status}`); + assert.strictEqual(res.status, 200); const expect = [ { UUID: 'vsegshifttest01uuid01', @@ -224,7 +219,7 @@ describe('segmentShift', function () { }), }) .then(async res => { - if (res.status !== 200) return done(`Status code was ${res.status}`); + assert.strictEqual(res.status, 200); const expect = [ { UUID: 'vsegshifttest01uuid01', @@ -266,7 +261,7 @@ describe('segmentShift', function () { }), }) .then(async res => { - if (res.status !== 200) return done(`Status code was ${res.status}`); + assert.strictEqual(res.status, 200); const expect = [ { UUID: 'vsegshifttest01uuid01', diff --git a/test/cases/setUsername.ts b/test/cases/setUsername.ts index b3e5ad4..58a0e5b 100644 --- a/test/cases/setUsername.ts +++ b/test/cases/setUsername.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import { Done, getbaseURL } from '../utils'; import { db, privateDB } from '../../src/databases/databases'; import { getHash } from '../../src/utils/getHash'; +import assert from 'assert'; const adminPrivateUserID = 'testUserId'; const user00PrivateUserID = 'setUsername_00'; @@ -51,21 +52,10 @@ function wellFormatUserName(userName: string) { } async function testUserNameChangelog(userID: string, newUserName: string, oldUserName: string, byAdmin: boolean, done: Done) { - const log = await getLastLogUserNameChange(userID); - - if (newUserName !== log.newUserName) { - return done(`UserID '${userID}' incorrect log on newUserName: ${newUserName} !== ${log.newUserName}`); - } - - if (oldUserName !== log.oldUserName) { - return done(`UserID '${userID}' incorrect log on oldUserName: ${oldUserName} !== ${log.oldUserName}`); - } - - if (byAdmin !== Boolean(log.updatedByAdmin)) { - return done(`UserID '${userID}' incorrect log on updatedByAdmin: ${byAdmin} !== ${log.updatedByAdmin}`); - } - + assert.strictEqual(newUserName, log.newUserName); + assert.strictEqual(oldUserName, log.oldUserName); + assert.strictEqual(byAdmin, Boolean(log.updatedByAdmin)); return done(); } @@ -86,9 +76,9 @@ describe('setUsername', () => { }) .then(async res => { const usernameInfo = await getUsernameInfo(getHash(user00PrivateUserID)); - if (res.status !== 200) done(`Status code was ${res.status}`); - if (usernameInfo.userName !== username00) done(`Username did not change. Currently is ${usernameInfo.userName}`); - if (usernameInfo.locked == "1") done(`Username was locked when it shouldn't have been`); + assert.strictEqual(res.status, 200); + assert.strictEqual(usernameInfo.userName, username00); + assert.notStrictEqual(usernameInfo.locked, 1, "username should not be locked"); done(); }) .catch(() => done(`couldn't call endpoint`)); @@ -99,10 +89,8 @@ describe('setUsername', () => { method: 'POST', }) .then(async res => { - if (res.status !== 200) done(`Status code was ${res.status}`); - else { - testUserNameChangelog(user01PrivateUserID, decodeURIComponent('Changed%20Username'), username01, false, done); - } + assert.strictEqual(res.status, 200); + testUserNameChangelog(user01PrivateUserID, decodeURIComponent('Changed%20Username'), username01, false, done); }) .catch(() => done(`couldn't call endpoint`)); }); @@ -112,8 +100,8 @@ describe('setUsername', () => { method: 'POST', }) .then(res => { - if (res.status !== 400) done(`Status code was ${res.status}`); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) .catch(() => done(`couldn't call endpoint`)); }); @@ -123,8 +111,8 @@ describe('setUsername', () => { method: 'POST', }) .then(res => { - if (res.status !== 400) done(`Status code was ${res.status}`); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) .catch(() => done(`couldn't call endpoint`)); }); @@ -135,8 +123,8 @@ describe('setUsername', () => { method: 'POST', }) .then(res => { - if (res.status !== 400) done(`Status code was ${res.status}`); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) .catch(() => done(`couldn't call endpoint`)); }); @@ -147,14 +135,10 @@ describe('setUsername', () => { method: 'POST', }) .then(async res => { - if (res.status !== 200) done(`Status code was ${res.status}`); - else { - const userNameInfo = await getUsernameInfo(getHash(user02PrivateUserID)); - if (userNameInfo.userName === newUsername) { - done(`Username '${username02}' got changed to '${newUsername}'`); - } - else done(); - } + assert.strictEqual(res.status, 200); + const userNameInfo = await getUsernameInfo(getHash(user02PrivateUserID)); + assert.notStrictEqual(userNameInfo.userName, newUsername); + done(); }) .catch(() => done(`couldn't call endpoint`)); }); @@ -166,8 +150,8 @@ describe('setUsername', () => { }) .then(async () => { const usernameInfo = await getUsernameInfo(getHash(user03PrivateUserID)); - if (usernameInfo.userName !== newUsername) done(`Username did not change`); - if (usernameInfo.locked == "1") done(`Username was locked when it shouldn't have been`); + assert.strictEqual(usernameInfo.userName, newUsername, "Username should change"); + assert.notStrictEqual(usernameInfo.locked, 1, "Username should not be locked"); testUserNameChangelog(user03PrivateUserID, newUsername, username03, false, done); }) .catch(() => done(`couldn't call endpoint`)); @@ -180,9 +164,9 @@ describe('setUsername', () => { }) .then(async () => { const usernameInfo = await getUsernameInfo(getHash(user04PrivateUserID)); - if (usernameInfo.userName === newUsername) done(`Username '${username04}' got changed to '${usernameInfo}'`); - if (usernameInfo.locked == "0") done(`Username was unlocked when it shouldn't have been`); - else done(); + assert.notStrictEqual(usernameInfo.userName, newUsername, "Username should not be changed"); + assert.strictEqual(usernameInfo.locked, 1, "username should be locked"); + done(); }) .catch(() => done(`couldn't call endpoint`)); }); @@ -194,7 +178,7 @@ describe('setUsername', () => { }) .then(async () => { const usernameInfo = await getUsernameInfo(getHash(user05PrivateUserID)); - if (usernameInfo.userName === newUsername) done(`Username contains unicode control characters`); + assert.notStrictEqual(usernameInfo.userName, newUsername, "Username should not contain control characters"); testUserNameChangelog(user05PrivateUserID, wellFormatUserName(newUsername), username05, false, done); }) .catch(() => done(`couldn't call endpoint`)); @@ -206,8 +190,8 @@ describe('setUsername', () => { method: 'POST', }) .then(async res => { - if (res.status !== 403) done(`Status code was ${res.status}`); - else done(); + assert.strictEqual(res.status, 403); + done(); }) .catch(() => done(`couldn't call endpoint`)); }); @@ -219,9 +203,9 @@ describe('setUsername', () => { }) .then(async () => { const usernameInfo = await getUsernameInfo(getHash(user06PrivateUserID)); - if (usernameInfo.userName !== newUsername) done(`Failed to change username from '${username06}' to '${newUsername}'`); - if (usernameInfo.locked == "0") done(`Username was not locked`); - else testUserNameChangelog(user06PrivateUserID, newUsername, username06, true, done); + assert.strictEqual(usernameInfo.userName, newUsername, "username should be changed"); + assert.strictEqual(usernameInfo.locked, 1, "Username should be locked"); + testUserNameChangelog(user06PrivateUserID, newUsername, username06, true, done); }) .catch(() => done(`couldn't call endpoint`)); }); @@ -233,9 +217,9 @@ describe('setUsername', () => { }) .then(async () => { const usernameInfo = await getUsernameInfo(getHash(user06PrivateUserID)); - if (usernameInfo.userName !== newUsername) done(`Failed to change username from '${username06}' to '${newUsername}'`); - if (usernameInfo.locked == "0") done(`Username was unlocked when it shouldn't have been`); - else testUserNameChangelog(user07PrivateUserID, newUsername, username07, true, done); + assert.strictEqual(usernameInfo.userName, newUsername, "Username should be changed"); + assert.strictEqual(usernameInfo.locked, 1, "Username should be locked"); + testUserNameChangelog(user07PrivateUserID, newUsername, username07, true, done); }) .catch(() => done(`couldn't call endpoint`)); }); diff --git a/test/cases/shadowBanUser.ts b/test/cases/shadowBanUser.ts index 49e05a4..6989097 100644 --- a/test/cases/shadowBanUser.ts +++ b/test/cases/shadowBanUser.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import {db} from '../../src/databases/databases'; import {Done, getbaseURL} from '../utils'; import {getHash} from '../../src/utils/getHash'; +import assert from 'assert'; describe('shadowBanUser', () => { before(async () => { @@ -28,19 +29,14 @@ describe('shadowBanUser', () => { method: 'POST' }) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const videoRow = await db.prepare('all', `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned", 1]); - const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned"]); - - if (shadowRow && videoRow?.length === 3) { - done(); - } else { - done("Ban failed " + JSON.stringify(videoRow) + " " + JSON.stringify(shadowRow)); - } - } + assert.strictEqual(res.status, 200); + const videoRow = await db.prepare('all', `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned", 1]); + const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned"]); + assert.ok(shadowRow); + assert.strictEqual(videoRow.length, 3); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to unban user without unhiding submissions', (done: Done) => { @@ -48,19 +44,14 @@ describe('shadowBanUser', () => { method: 'POST' }) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const videoRow = await db.prepare('all', `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned", 1]); - const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned"]); - - if (!shadowRow && videoRow?.length === 3) { - done(); - } else { - done("Unban failed " + JSON.stringify(videoRow) + " " + JSON.stringify(shadowRow)); - } - } + assert.strictEqual(res.status, 200); + const videoRow = await db.prepare('all', `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned", 1]); + const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned"]); + assert.ok(!shadowRow); + assert.strictEqual(videoRow.length, 3); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to ban user and hide submissions from only some categories', (done: Done) => { @@ -68,19 +59,15 @@ describe('shadowBanUser', () => { method: 'POST' }) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const videoRow: {category: string, shadowHidden: number}[] = (await db.prepare('all', `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned2", 1])); - const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned2"]); - - if (shadowRow && 2 == videoRow?.length && 2 === videoRow?.filter((elem) => elem?.category === "sponsor")?.length) { - done(); - } else { - done("Ban failed " + JSON.stringify(videoRow) + " " + JSON.stringify(shadowRow)); - } - } + assert.strictEqual(res.status, 200); + const videoRow: {category: string, shadowHidden: number}[] = (await db.prepare('all', `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned2", 1])); + const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned2"]); + assert.ok(shadowRow); + assert.strictEqual(videoRow.length, 2); + assert.strictEqual(videoRow.filter((elem) => elem.category === "sponsor").length, 2); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to unban user and unhide submissions', (done: Done) => { @@ -88,19 +75,14 @@ describe('shadowBanUser', () => { method: 'POST' }) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const videoRow = await db.prepare('all', `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned2", 1]); - const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned2"]); - - if (!shadowRow && videoRow?.length === 0) { - done(); - } else { - done("Unban failed " + JSON.stringify(videoRow) + " " + JSON.stringify(shadowRow)); - } - } + assert.strictEqual(res.status, 200); + const videoRow = await db.prepare('all', `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned2", 1]); + const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned2"]); + assert.ok(!shadowRow); + assert.strictEqual(videoRow?.length, 0); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); it('Should be able to unban user and unhide some submissions', (done: Done) => { @@ -108,19 +90,15 @@ describe('shadowBanUser', () => { method: 'POST' }) .then(async res => { - if (res.status !== 200) done("Status code was: " + res.status); - else { - const videoRow = await db.prepare('all', `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned3", 1]); - const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned3"]); - - if (!shadowRow && videoRow?.length === 1 && videoRow[0]?.category === "intro") { - done(); - } else { - done("Unban failed " + JSON.stringify(videoRow) + " " + JSON.stringify(shadowRow)); - } - } + assert.strictEqual(res.status, 200); + const videoRow = await db.prepare('all', `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned3", 1]); + const shadowRow = await db.prepare('get', `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned3"]); + assert.ok(!shadowRow); + assert.strictEqual(videoRow.length, 1); + assert.strictEqual(videoRow[0].category, "intro"); + done(); }) - .catch(() => done("Couldn't call endpoint")); + .catch(err => done(err)); }); }); diff --git a/test/cases/unBan.ts b/test/cases/unBan.ts index 19a6a16..6231cbe 100644 --- a/test/cases/unBan.ts +++ b/test/cases/unBan.ts @@ -2,6 +2,7 @@ import fetch from 'node-fetch'; import * as utils from '../utils'; import { getHash } from '../../src/utils/getHash'; import { db } from '../../src/databases/databases'; +import assert from 'assert'; describe('unBan', () => { before(async () => { @@ -31,19 +32,10 @@ describe('unBan', () => { }, }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ['unBan-videoID-0', 'testMan-unBan', 1]); - if (result.length !== 0) { - console.log(result); - done("Expected 0 banned entrys in db, got " + result.length); - } else { - done(); - } - } else { - const body = await res.text(); - console.log(body); - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ['unBan-videoID-0', 'testMan-unBan', 1]); + assert.strictEqual(result.length, 0); + done(); }) .catch(err => done(err)); }); @@ -56,19 +48,10 @@ describe('unBan', () => { }, }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ['unBan-videoID-1', 'testWoman-unBan', 1]); - if (result.length !== 1) { - console.log(result); - done("Expected 1 banned entry1 in db, got " + result.length); - } else { - done(); - } - } else { - const body = await res.text(); - console.log(body); - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ['unBan-videoID-1', 'testWoman-unBan', 1]); + assert.strictEqual(result.length, 1); + done(); }) .catch(err => done(err)); }); @@ -81,19 +64,10 @@ describe('unBan', () => { }, }) .then(async res => { - if (res.status === 200) { - const result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?', ['testEntity-unBan', 1]); - if (result.length !== 1) { - console.log(result); - done("Expected 1 banned entry1 in db, got " + result.length); - } else { - done(); - } - } else { - const body = await res.text(); - console.log(body); - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?', ['testEntity-unBan', 1]); + assert.strictEqual(result.length, 1); + done(); }) .catch(err => done(err)); }); diff --git a/test/cases/voteOnSponsorTime.ts b/test/cases/voteOnSponsorTime.ts index 8e0cc1e..54c727d 100644 --- a/test/cases/voteOnSponsorTime.ts +++ b/test/cases/voteOnSponsorTime.ts @@ -6,6 +6,7 @@ import {getHash} from '../../src/utils/getHash'; import {ImportMock} from 'ts-mock-imports'; import * as YouTubeAPIModule from '../../src/utils/youtubeApi'; import {YouTubeApiMock} from '../youtubeMock'; +import assert from 'assert'; const mockManager = ImportMock.mockStaticClass(YouTubeAPIModule, 'YouTubeAPI'); const sinonStub = mockManager.mock('listVideos'); @@ -66,16 +67,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID&UUID=vote-uuid-0&type=1") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-0"]); - if (row.votes === 3) { - done(); - } else { - done("Vote did not succeed. Submission went from 2 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-0"]); + assert.strictEqual(row.votes, 3); + done(); }) .catch(err => done(err)); }); @@ -84,16 +79,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-2&type=0") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]); - if (row.votes < 10) { - done(); - } else { - done("Vote did not succeed. Submission went from 10 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]); + assert.ok(row.votes < 10); + done(); }) .catch(err => done(err)); }); @@ -102,16 +91,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID3&UUID=vote-uuid-2&type=0") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]); - if (row.votes === 9) { - done(); - } else { - done("Vote did not fail. Submission went from 9 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]); + assert.strictEqual(row.votes, 9); + done(); }) .catch(err => done(err)); }); @@ -120,16 +103,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID4&UUID=vote-uuid-1.6&type=0") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.6"]); - if (row.votes === 10) { - done(); - } else { - done("Vote did not fail. Submission went from 10 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.6"]); + assert.strictEqual(row.votes, 10); + done(); }) .catch(err => done(err)); }); @@ -138,16 +115,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=hasNotSubmittedID&UUID=vote-uuid-1&type=1") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1"]); - if (row.votes === 2) { - done(); - } else { - done("Vote did not fail. Submission went from 2 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1"]); + assert.strictEqual(row.votes, 2); + done(); }) .catch(err => done(err)); }); @@ -156,16 +127,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=hasNotSubmittedID&UUID=vote-uuid-1.5&type=0") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.5"]); - if (row.votes === 10) { - done(); - } else { - done("Vote did not fail. Submission went from 10 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.5"]); + assert.strictEqual(row.votes, 10); + done(); }) .catch(err => done(err)); }); @@ -174,16 +139,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-3&type=0") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-3"]); - if (row.votes <= -2) { - done(); - } else { - done("Vote did not succeed. Submission went from 100 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-3"]); + assert.ok(row.votes <= -2); + done(); }) .catch(err => done(err)); }); @@ -192,16 +151,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=own-submission-id&UUID=own-submission-uuid&type=0") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["own-submission-uuid"]); - if (row.votes <= -2) { - done(); - } else { - done("Vote did not succeed. Submission went from 500 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["own-submission-uuid"]); + assert.ok(row.votes <= -2); + done(); }) .catch(err => done(err)); }); @@ -210,16 +163,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID2&UUID=not-own-submission-uuid&type=0") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["not-own-submission-uuid"]); - if (row.votes === 499) { - done(); - } else { - done("Vote did not succeed. Submission went from 500 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["not-own-submission-uuid"]); + assert.strictEqual(row.votes, 499); + done(); }) .catch(err => done(err)); }); @@ -228,19 +175,16 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-4&category=intro") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-4"]); - const categoryRows = await db.prepare('all', `SELECT votes, category FROM "categoryVotes" WHERE "UUID" = ?`, ["vote-uuid-4"]); - if (row.category === "sponsor" && categoryRows.length === 2 - && categoryRows[0]?.votes === 1 && categoryRows[0]?.category === "intro" - && categoryRows[1]?.votes === 1 && categoryRows[1]?.category === "sponsor") { - done(); - } else { - done("Submission changed to " + row.category + " instead of staying as sponsor. Vote was applied as " + categoryRows[0]?.category + " with " + categoryRows[0]?.votes + " votes and there were " + categoryRows.length + " rows."); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-4"]); + const categoryRows = await db.prepare('all', `SELECT votes, category FROM "categoryVotes" WHERE "UUID" = ?`, ["vote-uuid-4"]); + assert.strictEqual(row.category, "sponsor"); + assert.strictEqual(categoryRows.length, 2); + assert.strictEqual(categoryRows[0].votes, 1); + assert.strictEqual(categoryRows[0].category, "intro"); + assert.strictEqual(categoryRows[1].votes, 1); + assert.strictEqual(categoryRows[1].category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -249,16 +193,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category&category=fakecategory") .then(async res => { - if (res.status === 400) { - const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]); - if (row.category === "sponsor") { - done(); - } else { - done("Vote did not succeed. Submission went from sponsor to " + row.category); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 400); + const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]); + assert.strictEqual(row.category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -267,16 +205,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category&category=highlight") .then(async res => { - if (res.status === 400) { - const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]); - if (row.category === "sponsor") { - done(); - } else { - done("Vote did not succeed. Submission went from sponsor to " + row.category); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 400); + const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]); + assert.strictEqual(row.category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -296,13 +228,12 @@ describe('voteOnSponsorTime', () => { if (row?.category === "outro") outroVotes += row?.votes; if (row?.category === "sponsor") sponsorVotes += row?.votes; } - if (submissionRow.category === "sponsor" && categoryRows.length === 3 - && introVotes === 0 && outroVotes === 1 && sponsorVotes === 1) { - done(); - } else { - done("Submission changed to " + submissionRow.category + " instead of staying as sponsor. There were " - + introVotes + " intro votes, " + outroVotes + " outro votes and " + sponsorVotes + " sponsor votes."); - } + assert.strictEqual(submissionRow.category, "sponsor"); + assert.strictEqual(categoryRows.length, 3); + assert.strictEqual(introVotes, 0); + assert.strictEqual(outroVotes, 1); + assert.strictEqual(sponsorVotes, 1); + done(); } else { done("Status code was " + res.status); } @@ -317,11 +248,8 @@ describe('voteOnSponsorTime', () => { + "/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category-change&category=" + inputCat) .then(async () => { const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category-change"]); - if (row.category === assertCat) { - callback(); - } else { - done("Vote did not succeed. Submission went from sponsor to " + row.category); - } + assert.strictEqual(row.category, assertCat); + callback(); }) .catch(err => done(err)); }; @@ -335,17 +263,12 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-5&category=outro") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]); - const row2 = await db.prepare('get', `SELECT votes FROM "categoryVotes" WHERE "UUID" = ? and category = ?`, ["vote-uuid-5", "outro"]); - if (row.category === "outro" && row2.votes === 500) { - done(); - } else { - done("Vote did not succeed. Submission went from intro to " + row.category + ". Category votes are " + row2.votes + " and should be 500."); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]); + const row2 = await db.prepare('get', `SELECT votes FROM "categoryVotes" WHERE "UUID" = ? and category = ?`, ["vote-uuid-5", "outro"]); + assert.strictEqual(row.category, "outro"); + assert.strictEqual(row2.votes, 500); + done(); }) .catch(err => done(err)); }); @@ -354,16 +277,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=testman&UUID=vote-uuid-5_1&category=outro") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]); - if (row.category === "outro") { - done(); - } else { - done("Vote did not succeed. Submission went from intro to " + row.category + "."); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]); + assert.strictEqual(row.category, "outro"); + done(); }) .catch(err => done(err)); }); @@ -372,11 +289,8 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID3&UUID=invalid-uuid&category=intro") .then(async res => { - if (res.status === 400) { - done(); - } else { - done("Status code was " + res.status + " instead of 400."); - } + assert.strictEqual(res.status, 400); + done(); }) .catch(err => done(err)); }); @@ -385,12 +299,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-5&type=1") .then(async res => { + assert.strictEqual(res.status, 403); const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]); - if (res.status === 403 && row.votes === -3) { - done(); - } else { - done("Status code was " + res.status + ", row is " + JSON.stringify(row)); - } + assert.strictEqual(row.votes, -3); + done(); }) .catch(err => done(err)); }); @@ -399,12 +311,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-5&type=0") .then(async res => { + assert.strictEqual(res.status, 200); const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]); - if (res.status === 200 && row.votes === -3) { - done(); - } else { - done("Status code was " + res.status + ", row is " + JSON.stringify(row)); - } + assert.strictEqual(row.votes, -3); + done(); }) .catch(err => done(err)); }); @@ -413,16 +323,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-5&type=1") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]); - if (row.votes > -3) { - done(); - } else { - done("Vote did not succeed. Votes raised from -3 to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]); + assert.ok(row.votes > -3); + done(); }) .catch(err => done(err)); }); @@ -431,11 +335,8 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=warn-voteuser01&UUID=warnvote-uuid-0&type=1") .then(async res => { - if (res.status === 403) { - done(); // success - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 403); + done(); }) .catch(err => done(err)); }); @@ -444,12 +345,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&type=0") .then(async res => { + assert.strictEqual(res.status, 200); const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]); - if (res.status === 200 && row.votes === 2) { - done(); - } else { - done("Status code was " + res.status + " instead of 200, row was " + JSON.stringify(row)); - } + assert.strictEqual(row.votes, 2); + done(); }) .catch(err => done(err)); }); @@ -458,12 +357,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&type=1") .then(async res => { + assert.strictEqual(res.status, 200); const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]); - if (res.status === 200 && row.votes === 3) { - done(); - } else { - done("Status code was " + res.status + " instead of 403, row was " + JSON.stringify(row)); - } + assert.strictEqual(row.votes, 3); + done(); }) .catch(err => done(err)); }); @@ -472,12 +369,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&category=outro") .then(async res => { + assert.strictEqual(res.status, 200); const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]); - if (res.status === 200 && row.category === "sponsor") { - done(); - } else { - done("Status code was " + res.status + " instead of 200, row was " + JSON.stringify(row)); - } + assert.strictEqual(row.category, "sponsor"); + done(); }) .catch(err => done(err)); }); @@ -486,16 +381,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=1") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]); - if (row?.locked) { - done(); - } else { - done("Segment not locked"); - } - } else { - done("Status code was " + res.status + " instead of 200"); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]); + assert.ok(row.locked); + done(); }) .catch(err => done(err)); }); @@ -504,16 +393,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=0") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]); - if (!row?.locked) { - done(); - } else { - done("Segment not locked"); - } - } else { - done("Status code was " + res.status + " instead of 200"); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]); + assert.ok(!row.locked); + done(); }) .catch(err => done(err)); }); @@ -522,16 +405,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-hidden-uuid-1&type=1") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "hidden" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-hidden-uuid-1"]); - if (!row?.hidden) { - done(); - } else { - done("Segment not unhidden"); - } - } else { - done("Status code was " + res.status + " instead of 200"); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "hidden" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-hidden-uuid-1"]); + assert.ok(!row?.hidden); + done(); }) .catch(err => done(err)); }); @@ -540,16 +417,10 @@ describe('voteOnSponsorTime', () => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-2&type=20") .then(async res => { - if (res.status === 200) { - const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]); - if (row.votes === 10) { - done(); - } else { - done("Vote did not succeed. Submission went from 10 votes to " + row.votes); - } - } else { - done("Status code was " + res.status); - } + assert.strictEqual(res.status, 200); + const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]); + assert.strictEqual(row.votes, 10); + done(); }) .catch(err => done(err)); }); @@ -557,19 +428,18 @@ describe('voteOnSponsorTime', () => { it('Should not be able to vote with type 10', (done: Done) => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=10") .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done('couldn\'t call endpoint')); + .catch(err => done(err)); }); it('Should not be able to vote with type 11', (done: Done) => { fetch(getbaseURL() + "/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=11") .then(res => { - if (res.status !== 400) done('non 400 (' + res.status + ')'); - else done(); // pass + assert.strictEqual(res.status, 400); + done(); }) - .catch(() => done('couldn\'t call endpoint')); + .catch(err => done(err)); }); - }); diff --git a/test/test.ts b/test/test.ts index bba97ab..ddd6257 100644 --- a/test/test.ts +++ b/test/test.ts @@ -12,9 +12,7 @@ import rateLimit from 'express-rate-limit'; async function init() { ImportMock.mockFunction(rateLimitMiddlewareModule, 'rateLimitMiddleware', rateLimit({ - skip: () => { - return true; - } + skip: () => true })); // delete old test database @@ -35,10 +33,10 @@ async function init() { // Add each .ts file to the mocha instance fs.readdirSync(testDir) - .filter(function(file) { + .filter((file) => // Only keep the .ts files - return file.substr(-3) === '.ts'; - }) + file.substr(-3) === '.ts' + ) .forEach(function(file) { mocha.addFile( path.join(testDir, file)