libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

tests: Clear auth hooks before running import/export unit tests

Browse source 
Also fix some ESLint complaints.
This commit is contained in:
Richard Hansen 2020-10-29 19:05:36 -04:00
parent 03d8882383
commit b41d9762fa
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/backend/specs/api/importexportGetPost.js
View file

@ -1,3 +1,5 @@
/* global __dirname, __filename, afterEach, before, beforeEach, describe, it, require */
/* /*
* Import and Export tests for the /p/whateverPadId/import and /p/whateverPadId/export endpoints. * Import and Export tests for the /p/whateverPadId/import and /p/whateverPadId/export endpoints.
*/ */
@ -32,7 +34,7 @@ describe(__filename, function() {
.expect(200) .expect(200)
.expect('Content-Type', /json/); .expect('Content-Type', /json/);
}); });
}) });
describe('API Versioning', function(){ describe('API Versioning', function(){
it('finds the version tag', async function() { it('finds the version tag', async function() {
@ -40,7 +42,7 @@ describe(__filename, function() {
.expect(200) .expect(200)
.expect((res) => assert(res.body.currentVersion)); .expect((res) => assert(res.body.currentVersion));
}); });
}) });
/* /*
Tests Tests
@ -72,11 +74,20 @@ describe(__filename, function() {
const backups = {}; const backups = {};
beforeEach(async function() { beforeEach(async function() {
backups.hooks = {};
for (const hookName of ['preAuthorize', 'authenticate', 'authorize']) {
backups.hooks[hookName] = plugins.hooks[hookName];
plugins.hooks[hookName] = [];
}
// Note: This is a shallow copy. // Note: This is a shallow copy.
backups.settings = Object.assign({}, settings); backups.settings = Object.assign({}, settings);
settings.requireAuthentication = false;
settings.requireAuthorization = false;
settings.users = {user: {password: 'user-password'}};
}); });
afterEach(async function() { afterEach(async function() {
Object.assign(plugins.hooks, backups.hooks);
// Note: This does not unset settings that were added. // Note: This does not unset settings that were added.
Object.assign(settings, backups.settings); Object.assign(settings, backups.settings);
}); });
@ -231,18 +242,13 @@ describe(__filename, function() {
beforeEach(async function() { beforeEach(async function() {
await deleteTestPad(); await deleteTestPad();
settings.requireAuthentication = false;
settings.requireAuthorization = true; settings.requireAuthorization = true;
settings.users = {user: {password: 'user-password'}};
authorize = () => true; authorize = () => true;
backups.hooks = {};
backups.hooks.authorize = plugins.hooks.authorize || [];
plugins.hooks.authorize = [{hook_fn: (hookName, {req}, cb) => cb([authorize(req)])}]; plugins.hooks.authorize = [{hook_fn: (hookName, {req}, cb) => cb([authorize(req)])}];
}); });
afterEach(async function() { afterEach(async function() {
await deleteTestPad(); await deleteTestPad();
Object.assign(plugins.hooks, backups.hooks);
}); });
it('!authn !exist -> create', async function() { it('!authn !exist -> create', async function() {
@ -353,7 +359,7 @@ describe(__filename, function() {
var endPoint = function(point, version){ var endPoint = function(point, version){
version = version || apiVersion; version = version || apiVersion;
return `/api/${version}/${point}?apikey=${apiKey}`; return `/api/${version}/${point}?apikey=${apiKey}`;
} };
function makeid() function makeid()
{ {