diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2021-06-09 10:58:18 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2021-06-14 17:00:32 +0200 |
| commit | d392893cd73dc00c927f342778f6dca9628d328e (patch) | |
| tree | e2ea3eec09f36b7122ecdbc498c3c130e240e85c /hugolib/js_test.go | |
| parent | a886dd53b80322e1edf924f2ede4d4ea037c5baf (diff) | |
Misc config loading fixes
The main motivation behind this is simplicity and correctnes, but the new small config library is also faster:
```
BenchmarkDefaultConfigProvider/Viper-16 252418 4546 ns/op 2720 B/op 30 allocs/op
BenchmarkDefaultConfigProvider/Custom-16 450756 2651 ns/op 1008 B/op 6 allocs/op
```
Fixes #8633
Fixes #8618
Fixes #8630
Updates #8591
Closes #6680
Closes #5192
Diffstat (limited to 'hugolib/js_test.go')
| -rw-r--r-- | hugolib/js_test.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hugolib/js_test.go b/hugolib/js_test.go index cd0883fd5..75dc0e7de 100644 --- a/hugolib/js_test.go +++ b/hugolib/js_test.go @@ -21,11 +21,10 @@ import ( "testing" "github.com/gohugoio/hugo/common/hexec" + "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/htesting" - "github.com/spf13/viper" - qt "github.com/frankban/quicktest" "github.com/gohugoio/hugo/hugofs" @@ -88,7 +87,7 @@ document.body.textContent = greeter(user);` c.Assert(err, qt.IsNil) defer clean() - v := viper.New() + v := config.New() v.Set("workingDir", workDir) v.Set("disableKinds", []string{"taxonomy", "term", "page"}) b := newTestSitesBuilder(t).WithLogger(loggers.NewWarningLogger()) @@ -162,7 +161,7 @@ func TestJSBuild(t *testing.T) { c.Assert(err, qt.IsNil) defer clean() - config := fmt.Sprintf(` + tomlConfig := fmt.Sprintf(` baseURL = "https://example.org" workingDir = %q @@ -177,8 +176,8 @@ path="github.com/gohugoio/hugoTestProjectJSModImports" `, workDir) b := newTestSitesBuilder(t) - b.Fs = hugofs.NewDefault(viper.New()) - b.WithWorkingDir(workDir).WithConfigFile("toml", config).WithLogger(loggers.NewInfoLogger()) + b.Fs = hugofs.NewDefault(config.New()) + b.WithWorkingDir(workDir).WithConfigFile("toml", tomlConfig).WithLogger(loggers.NewInfoLogger()) b.WithSourceFile("go.mod", `module github.com/gohugoio/tests/testHugoModules go 1.15 |