diff --git a/src/backend/model/extension/ExtensionConfigWrapper.ts b/src/backend/model/extension/ExtensionConfigWrapper.ts index d96e4bc7..ec24c3a9 100644 --- a/src/backend/model/extension/ExtensionConfigWrapper.ts +++ b/src/backend/model/extension/ExtensionConfigWrapper.ts @@ -22,9 +22,8 @@ export class ExtensionConfigWrapper { // make sure the config file exists by the time we load it. // TODO: remove this once typeconfig is fixed and can properly load defaults in arrays if (!fs.existsSync((pc.__options as ConfigClassOptions).configPath)) { - await pc.save(); + await pc.load(); } - await pc.load(); // loading the basic configs, but we do not know the extension config hierarchy yet // TODO make sure that all extensions are present even after loading them from file @@ -47,7 +46,7 @@ export class ExtensionConfigWrapper { // make sure the config file exists by the time we load it. // TODO: remove this once typeconfig is fixed and can properly load defaults in arrays if (!fs.existsSync((pc.__options as ConfigClassOptions).configPath)) { - pc.saveSync(); + pc.loadSync(); } pc.loadSync(); // loading the basic configs, but we do not know the extension config hierarchy yet // TODO make sure that all extensions are present even after loading them from file diff --git a/src/common/config/private/PrivateConfigClass.ts b/src/common/config/private/PrivateConfigClass.ts index f9d34834..d7386684 100644 --- a/src/common/config/private/PrivateConfigClass.ts +++ b/src/common/config/private/PrivateConfigClass.ts @@ -15,7 +15,7 @@ const isTesting = process.env['NODE_ENV'] == true || ['afterEach', 'after', 'bef .every((fn) => (global as any)[fn] instanceof Function); @ConfigClass & ServerConfig>({ - configPath: path.join(__dirname, !isTesting ? './../../../../config.json' : './../../../../test/backend/tmp/config.json'), + configPath: path.join(__dirname, !isTesting ? './../../../../config.json' : './../../../../test/tmp/config.json'), crateConfigPathIfNotExists: isTesting, saveIfNotExist: true, attachDescription: true, diff --git a/test/common/unit/config/Config.ts b/test/common/unit/config/Config.ts new file mode 100644 index 00000000..f288d02f --- /dev/null +++ b/test/common/unit/config/Config.ts @@ -0,0 +1,25 @@ +import {expect} from 'chai'; +import {ConfigClassBuilder} from 'typeconfig/node'; +import {ExtensionConfigWrapper} from '../../../../src/backend/model/extension/ExtensionConfigWrapper'; +import {TestHelper} from '../../../TestHelper'; +import * as fs from 'fs'; + + +describe('Config', () => { + beforeEach(async () => { + await fs.promises.rm(TestHelper.TMP_DIR, {recursive: true, force: true}); + }); + afterEach(async () => { + await fs.promises.rm(TestHelper.TMP_DIR, {recursive: true, force: true}); + }); + it('should load default from env', () => { + process.env['default-Media-tempFolder'] = 'test/test'; + const conf = ExtensionConfigWrapper.originalSync(); + expect(conf.Media.tempFolder).to.be.equal('test/test'); + expect(ConfigClassBuilder.attachPrivateInterface(conf.Media).__defaults.tempFolder).to.be.equal('test/test'); + expect(process.env['default-Media-tempFolder']).to.be.equal('test/test'); + const conf2 = ExtensionConfigWrapper.originalSync(); + expect(ConfigClassBuilder.attachPrivateInterface(conf2.Media).__defaults.tempFolder).to.be.equal('test/test'); + expect(conf2.Media.tempFolder).to.be.equal('test/test'); + }); +});