From dc6407251f7e72214f971b44abc5847dd3c2e533 Mon Sep 17 00:00:00 2001 From: "Patrik J. Braun" Date: Sun, 1 Jan 2023 22:47:39 +0100 Subject: [PATCH] Fixing /Get settings test #569 --- .../integration/routers/admin/SettingsRouter.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/backend/integration/routers/admin/SettingsRouter.ts b/test/backend/integration/routers/admin/SettingsRouter.ts index ccad8c95..d196b78e 100644 --- a/test/backend/integration/routers/admin/SettingsRouter.ts +++ b/test/backend/integration/routers/admin/SettingsRouter.ts @@ -3,8 +3,9 @@ import * as fs from 'fs'; import {Config} from '../../../../../src/common/config/private/Config'; import {SQLConnection} from '../../../../../src/backend/model/database/sql/SQLConnection'; import {Server} from '../../../../../src/backend/server'; -import {DatabaseType} from '../../../../../src/common/config/private/PrivateConfig'; +import {DatabaseType, ServerConfig} from '../../../../../src/common/config/private/PrivateConfig'; import {ProjectPath} from '../../../../../src/backend/ProjectPath'; +import {TAGS} from '../../../../../src/common/config/public/ClientConfig'; process.env.NODE_ENV = 'test'; const chai: any = require('chai'); @@ -33,8 +34,8 @@ describe('SettingsRouter', () => { it('it should GET the settings', async () => { Config.Users.authenticationRequired = false; const originalSettings = await Config.original(); - originalSettings.Server.sessionSecret = null; - originalSettings.Users.enforcedUsers = null; + // originalSettings.Server.sessionSecret = null; + // originalSettings.Users.enforcedUsers = null; const srv = new Server(); await srv.onStarted.wait(); const result = await chai.request(srv.App) @@ -43,9 +44,13 @@ describe('SettingsRouter', () => { result.res.should.have.status(200); result.body.should.be.a('object'); should.equal(result.body.error, null); - result.body.result.Server.Environment.upTime = null; + (result.body.result as ServerConfig).Environment.upTime = null; originalSettings.Environment.upTime = null; - result.body.result.should.deep.equal(JSON.parse(JSON.stringify(originalSettings.toJSON({attachState: true, attachVolatile: true})))); + result.body.result.should.deep.equal(JSON.parse(JSON.stringify(originalSettings.toJSON({ + attachState: true, + attachVolatile: true, + skipTags: {secret: true} as TAGS + })))); }); }); });