From d070bdf10f14d233288f7318a4e9f7555f070a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Mon, 21 Mar 2022 09:35:15 +0100 Subject: Rework the Destination filesystem to make --renderStaticToDisk work See #9626 --- config/configProvider.go | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'config/configProvider.go') diff --git a/config/configProvider.go b/config/configProvider.go index cf4c3dab3..01a2e8c54 100644 --- a/config/configProvider.go +++ b/config/configProvider.go @@ -45,13 +45,23 @@ func GetStringSlicePreserveString(cfg Provider, key string) []string { } // SetBaseTestDefaults provides some common config defaults used in tests. -func SetBaseTestDefaults(cfg Provider) { - cfg.Set("resourceDir", "resources") - cfg.Set("contentDir", "content") - cfg.Set("dataDir", "data") - cfg.Set("i18nDir", "i18n") - cfg.Set("layoutDir", "layouts") - cfg.Set("assetDir", "assets") - cfg.Set("archetypeDir", "archetypes") - cfg.Set("publishDir", "public") +func SetBaseTestDefaults(cfg Provider) Provider { + setIfNotSet(cfg, "baseURL", "https://example.org") + setIfNotSet(cfg, "resourceDir", "resources") + setIfNotSet(cfg, "contentDir", "content") + setIfNotSet(cfg, "dataDir", "data") + setIfNotSet(cfg, "i18nDir", "i18n") + setIfNotSet(cfg, "layoutDir", "layouts") + setIfNotSet(cfg, "assetDir", "assets") + setIfNotSet(cfg, "archetypeDir", "archetypes") + setIfNotSet(cfg, "publishDir", "public") + setIfNotSet(cfg, "workingDir", "") + setIfNotSet(cfg, "defaultContentLanguage", "en") + return cfg +} + +func setIfNotSet(cfg Provider, key string, value any) { + if !cfg.IsSet(key) { + cfg.Set(key, value) + } } -- cgit v1.2.3