mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-17 21:01:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

hugolib: Add ConfigSourceDescriptor

Browse Source 
To prepare for config in themes

See #4490
This commit is contained in:
Bjørn Erik Pedersen
2018-03-18 10:32:29 +01:00
parent b6798ee867
commit 3d1a6e109c
6 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hugolib/testhelpers_test.go
View File

@@ -229,7 +229,7 @@ func (s *sitesBuilder) CreateSites() *sitesBuilder {
s.writeFilePairs("i18n", s.i18nFilePairsAdded)
if s.Cfg == nil {
cfg, err := LoadConfig(s.Fs.Source, "", "config."+s.configFormat)
cfg, err := LoadConfig(ConfigSourceDescriptor{Fs: s.Fs.Source, Name: "config." + s.configFormat})
if err != nil {
s.Fatalf("Failed to load config: %s", err)
}
@@ -460,7 +460,7 @@ func newTestSitesFromConfig(t testing.TB, afs afero.Fs, tomlConfig string, layou
writeToFs(t, afs, "config.toml", tomlConfig)
cfg, err := LoadConfig(afs, "", "config.toml")
cfg, err := LoadConfigDefault(afs)
require.NoError(t, err)
fs := hugofs.NewFrom(afs, cfg)