From 93ca7c9e958e34469a337e4efcc7c75774ec50fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 5 Feb 2017 10:20:06 +0700 Subject: all: Refactor to nonglobal Viper, i18n etc. This is a final rewrite that removes all the global state in Hugo, which also enables the use if `t.Parallel` in tests. Updates #2701 Fixes #3016 --- hugolib/siteJSONEncode_test.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'hugolib/siteJSONEncode_test.go') diff --git a/hugolib/siteJSONEncode_test.go b/hugolib/siteJSONEncode_test.go index 1218bfd34..4b01a9144 100644 --- a/hugolib/siteJSONEncode_test.go +++ b/hugolib/siteJSONEncode_test.go @@ -20,15 +20,14 @@ import ( "path/filepath" "github.com/spf13/hugo/deps" - "github.com/spf13/hugo/hugofs" ) // Issue #1123 // Testing prevention of cyclic refs in JSON encoding // May be smart to run with: -timeout 4000ms func TestEncodePage(t *testing.T) { - - fs := hugofs.NewMem() + t.Parallel() + cfg, fs := newTestCfg() // borrowed from menu_test.go for _, src := range menuPageSources { @@ -36,7 +35,7 @@ func TestEncodePage(t *testing.T) { } - s := buildSingleSite(t, deps.DepsCfg{Fs: fs}, BuildCfg{}) + s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{}) _, err := json.Marshal(s) check(t, err) -- cgit v1.2.3