From fe0cf4bdb07decfce6c4b5c9253e771e4d5fea26 Mon Sep 17 00:00:00 2001 From: muxator Date: Tue, 24 Dec 2019 23:40:56 +0100 Subject: [PATCH] tests: reorganize some files, because we are going to copy & paste them. In the following commits Pierre is going to copy & modify some files. This commit prepares the source files in order to minimize those differences, so we can re-unify them as soon as possible. No functional changes. --- tests/backend/loadSettings.js | 6 ++++-- tests/backend/specs/api/pad.js | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/backend/loadSettings.js b/tests/backend/loadSettings.js index f208fe3d0..e1c9ddf31 100644 --- a/tests/backend/loadSettings.js +++ b/tests/backend/loadSettings.js @@ -1,13 +1,15 @@ var jsonminify = require(__dirname+"/../../src/node_modules/jsonminify"); +const fs = require('fs'); function loadSettings(){ var settingsStr = fs.readFileSync(__dirname+"/../../settings.json").toString(); // try to parse the settings - var settings; try { if(settingsStr) { settingsStr = jsonminify(settingsStr).replace(",]","]").replace(",}","}"); - return JSON.parse(settingsStr); + var settings = JSON.parse(settingsStr); + + return settings; } }catch(e){ console.error("whoops something is bad with settings"); diff --git a/tests/backend/specs/api/pad.js b/tests/backend/specs/api/pad.js index 4a0c6b6a2..269501a01 100644 --- a/tests/backend/specs/api/pad.js +++ b/tests/backend/specs/api/pad.js @@ -1,10 +1,10 @@ -var assert = require('assert') - supertest = require(__dirname+'/../../../../src/node_modules/supertest'), - fs = require('fs'), - settings = require(__dirname+'/../../loadSettings').loadSettings(), - api = supertest('http://'+settings.ip+":"+settings.port), - path = require('path'), - async = require(__dirname+'/../../../../src/node_modules/async'); +const assert = require('assert'); +const supertest = require(__dirname+'/../../../../src/node_modules/supertest'); +const fs = require('fs'); +const settings = require(__dirname+'/../../loadSettings').loadSettings(); +const api = supertest('http://'+settings.ip+":"+settings.port); +const path = require('path'); +const async = require(__dirname+'/../../../../src/node_modules/async'); var filePath = path.join(__dirname, '../../../../APIKEY.txt'); @@ -29,7 +29,7 @@ var ulHtml = '