Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-01-10 12:55:03 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-02-04 07:37:25 +0300
commitc71e1b106e6011d148cac899f83c4685dee33a22 (patch)
treec5c7090f0c2398c7771e4908ebcc97aa7714ffd2 /hugolib/embedded_shortcodes_test.go
parent0ada40591216572b0e4c6a8ab986b0aa4fb13c13 (diff)
all: Refactor to nonglobal file systems
Updates #2701 Fixes #2951
Diffstat (limited to 'hugolib/embedded_shortcodes_test.go')
-rw-r--r--hugolib/embedded_shortcodes_test.go20
1 files changed, 11 insertions, 9 deletions
diff --git a/hugolib/embedded_shortcodes_test.go b/hugolib/embedded_shortcodes_test.go
index 61c40cf01..64a92247b 100644
--- a/hugolib/embedded_shortcodes_test.go
+++ b/hugolib/embedded_shortcodes_test.go
@@ -27,9 +27,11 @@ import (
"log"
"path/filepath"
- "github.com/spf13/hugo/tpl"
+ "github.com/spf13/hugo/deps"
"github.com/spf13/hugo/helpers"
+ "github.com/spf13/hugo/hugofs"
+ "github.com/spf13/hugo/tplapi"
jww "github.com/spf13/jwalterweatherman"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
@@ -65,17 +67,17 @@ func doTestShortcodeCrossrefs(t *testing.T, relative bool) {
path := filepath.FromSlash("blog/post.md")
in := fmt.Sprintf(`{{< %s "%s" >}}`, refShortcode, path)
- writeSource(t, "content/"+path, simplePageWithURL+": "+in)
+ fs := hugofs.NewMem()
+
+ writeSource(t, fs, "content/"+path, simplePageWithURL+": "+in)
expected := fmt.Sprintf(`%s/simple/url/`, expectedBase)
- sites, err := newHugoSitesDefaultLanguage()
- require.NoError(t, err)
+ s := buildSingleSite(t, deps.DepsCfg{Fs: fs}, BuildCfg{})
- require.NoError(t, sites.Build(BuildCfg{}))
- require.Len(t, sites.Sites[0].RegularPages, 1)
+ require.Len(t, s.RegularPages, 1)
- output := string(sites.Sites[0].RegularPages[0].Content)
+ output := string(s.RegularPages[0].Content)
if !strings.Contains(output, expected) {
t.Errorf("Got\n%q\nExpected\n%q", output, expected)
@@ -308,7 +310,7 @@ func TestShortcodeTweet(t *testing.T) {
},
}
- p, _ := pageFromString(simplePage, "simple.md", func(templ tpl.Template) error {
+ p, _ := pageFromString(simplePage, "simple.md", func(templ tplapi.Template) error {
templ.Funcs(tweetFuncMap)
return nil
})
@@ -361,7 +363,7 @@ func TestShortcodeInstagram(t *testing.T) {
},
}
- p, _ := pageFromString(simplePage, "simple.md", func(templ tpl.Template) error {
+ p, _ := pageFromString(simplePage, "simple.md", func(templ tplapi.Template) error {
templ.Funcs(instagramFuncMap)
return nil
})