xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

Fixing settings setting tests #683

Browse Source
This commit is contained in:
Patrik J. Braun 2023-07-30 14:40:54 +02:00
parent 8fc0512998
commit cb8553896f
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/backend/Environment.ts
View File

@ -1,4 +1,5 @@
/**
* Keeps the environment context
* Only use it in the Config constructor
*/
export const ServerEnvironment: { sendMailAvailable?: boolean } = {};

4
src/common/config/private/Config.ts
View File

@ -7,6 +7,7 @@ import {IConfigClass} from 'typeconfig/common';
import {PasswordHelper} from '../../../backend/model/PasswordHelper';
import {TAGS} from '../public/ClientConfig';
import {ServerEnvironment} from '../../../backend/Environment';
import {EmailMessagingType} from './MessagingConfig';
declare const process: any;
@ -82,6 +83,9 @@ export class PrivateConfigClass extends ServerConfig {
this.Environment.isDocker = !!process.env.PI_DOCKER;
if (typeof ServerEnvironment.sendMailAvailable !== 'undefined') {
this.Environment.sendMailAvailable = ServerEnvironment.sendMailAvailable;
if(!this.Environment.sendMailAvailable){ //onNewValue is not yet available as a callback
this.Messaging.Email.type = EmailMessagingType.SMTP;
}
}
}

7
test/backend/unit/middlewares/admin/SettingsMWs.ts
View File

@ -6,6 +6,8 @@ import {SettingsMWs} from '../../../../../src/backend/middlewares/admin/Settings
import {ServerUserConfig} from '../../../../../src/common/config/private/PrivateConfig';
import {Config} from '../../../../../src/common/config/private/Config';
import {UserRoles} from '../../../../../src/common/entities/UserDTO';
import {ConfigClassBuilder} from '../../../../../node_modules/typeconfig/node';
import {ServerEnvironment} from '../../../../../src/backend/Environment';
declare const describe: any;
@ -19,6 +21,8 @@ describe('Settings middleware', () => {
});
it('should save empty enforced users settings', (done: (err?: any) => void) => {
ServerEnvironment.sendMailAvailable = false;
const req: any = {
session: {},
sessionOptions: {},
@ -26,12 +30,13 @@ describe('Settings middleware', () => {
params: {},
body: {
settingsPath: 'Users',
settings: new ServerUserConfig()
settings: ConfigClassBuilder.attachPrivateInterface(new ServerUserConfig()).toJSON()
}
};
req.body.settings.enforcedUsers = [];
const next: any = (err: ErrorDTO) => {
try {
expect(err).to.be.undefined;
expect(Config.Users.enforcedUsers.length).to.be.equal(0);
done();
} catch (err) {