mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-25 09:56:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fixed settings.

Browse source
This commit is contained in:
SamTV12345 2024-02-21 22:22:38 +01:00
parent 419ee5b371
commit ff5a0688f3
9 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tests/backend/specs/api/importexportGetPost.js
View file

@ -190,6 +190,7 @@ describe(__filename, function () {
before(async function () {
if ((!settings.abiword || settings.abiword.indexOf('/') === -1) &&
(!settings.soffice || settings.soffice.indexOf('/') === -1)) {
console.log('Skipping AbiWord/LibreOffice tests because abiword or soffice is not set.');
this.skip();
}
});

10
src/tests/backend/specs/favicon.js
View file

@ -5,7 +5,7 @@ const common = require('../common');
const fs = require('fs');
const fsp = fs.promises;
const path = require('path');
import {settings} from '../../../node/utils/Settings'
import {root, settings} from '../../../node/utils/Settings'
const superagent = require('superagent');
describe(__filename, function () {
@ -19,13 +19,13 @@ describe(__filename, function () {
before(async function () {
agent = await common.init();
wantCustomIcon = await fsp.readFile(path.join(__dirname, 'favicon-test-custom.png'));
wantDefaultIcon = await fsp.readFile(path.join(settings.root, 'src', 'static', 'favicon.ico'));
wantDefaultIcon = await fsp.readFile(path.join(root, 'src', 'static', 'favicon.ico'));
wantSkinIcon = await fsp.readFile(path.join(__dirname, 'favicon-test-skin.png'));
});
beforeEach(async function () {
backupSettings = {...settings};
skinDir = await fsp.mkdtemp(path.join(settings.root, 'src', 'static', 'skins', 'test-'));
skinDir = await fsp.mkdtemp(path.join(root, 'src', 'static', 'skins', 'test-'));
settings.skinName = path.basename(skinDir);
});
@ -43,7 +43,7 @@ describe(__filename, function () {
it('uses custom favicon if set (relative pathname)', async function () {
settings.favicon =
path.relative(settings.root, path.join(__dirname, 'favicon-test-custom.png'));
path.relative(root, path.join(__dirname, 'favicon-test-custom.png'));
assert(!path.isAbsolute(settings.favicon));
const {body: gotIcon} = await agent.get('/favicon.ico')
.accept('png').buffer(true).parse(superagent.parse.image)
@ -69,7 +69,7 @@ describe(__filename, function () {
it('falls back if custom favicon is missing', async function () {
// The previous default for settings.favicon was 'favicon.ico', so many users will continue to
// have that in their settings.json for a long time. There is unlikely to be a favicon at
// path.resolve(settings.root, 'favicon.ico'), so this test ensures that 'favicon.ico' won't be
// path.resolve(root, 'favicon.ico'), so this test ensures that 'favicon.ico' won't be
// a problem for those users.
settings.favicon = 'favicon.ico';
const {body: gotIcon} = await agent.get('/favicon.ico')