diff --git a/core/server/data/schema/default-settings.json b/core/server/data/schema/default-settings/default-settings.json similarity index 100% rename from core/server/data/schema/default-settings.json rename to core/server/data/schema/default-settings/default-settings.json diff --git a/core/server/data/schema/default-settings/index.js b/core/server/data/schema/default-settings/index.js new file mode 100644 index 0000000000..b83d3919ae --- /dev/null +++ b/core/server/data/schema/default-settings/index.js @@ -0,0 +1,6 @@ +const config = require('../../../../shared/config'); + +const defaultSettingsPath = config.get('paths').defaultSettings; +const defaultSettings = require(defaultSettingsPath); + +module.exports = defaultSettings; diff --git a/core/shared/config/defaults.json b/core/shared/config/defaults.json index 0f47e4b730..a20e1977e8 100644 --- a/core/shared/config/defaults.json +++ b/core/shared/config/defaults.json @@ -17,6 +17,7 @@ "paths": { "contentPath": "content/", "fixtures": "core/server/data/schema/fixtures/fixtures", + "defaultSettings": "core/server/data/schema/default-settings/default-settings", "assetSrc": "core/frontend/src" }, "adapters": { diff --git a/test/unit/server/data/exporter/index.test.js b/test/unit/server/data/exporter/index.test.js index 16ce51d88f..7c8b15b8b2 100644 --- a/test/unit/server/data/exporter/index.test.js +++ b/test/unit/server/data/exporter/index.test.js @@ -191,7 +191,7 @@ describe('Exporter', function () { const { SETTING_KEYS_BLOCKLIST } = require('../../../../../core/server/data/exporter/table-lists.js'); - const defaultSettings = require('../../../../../core/server/data/schema/default-settings.json'); + const defaultSettings = require('../../../../../core/server/data/schema/default-settings/default-settings.json'); const totalKeysLength = Object.keys(defaultSettings).reduce((acc, curr, index) => { return acc + Object.keys(defaultSettings[curr]).length; diff --git a/test/unit/server/data/schema/integrity.test.js b/test/unit/server/data/schema/integrity.test.js index 1001238432..82d570abe0 100644 --- a/test/unit/server/data/schema/integrity.test.js +++ b/test/unit/server/data/schema/integrity.test.js @@ -7,7 +7,7 @@ const path = require('path'); const {config} = require('../../../../utils/configUtils'); const schema = require('../../../../../core/server/data/schema/schema'); const fixtures = require('../../../../../core/server/data/schema/fixtures/fixtures.json'); -const defaultSettings = require('../../../../../core/server/data/schema/default-settings.json'); +const defaultSettings = require('../../../../../core/server/data/schema/default-settings/default-settings.json'); // Routes are yaml so we can require the file directly const routeSettings = require('../../../../../core/server/services/route-settings');