mirror of
https://github.com/gohugoio/hugo.git
synced 2025-08-20 21:31:32 +02:00
Fixing some bugs introduced in prior few commits. Tests now pass.
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package hugolib
|
||||
|
||||
import (
|
||||
"github.com/spf13/hugo/template/bundle"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
@@ -10,7 +9,7 @@ func pageFromString(in, filename string) (*Page, error) {
|
||||
return ReadFrom(strings.NewReader(in), filename)
|
||||
}
|
||||
|
||||
func CheckShortCodeMatch(t *testing.T, input, expected string, template bundle.Template) {
|
||||
func CheckShortCodeMatch(t *testing.T, input, expected string, template Template) {
|
||||
|
||||
p, _ := pageFromString(SIMPLE_PAGE, "simple.md")
|
||||
output := ShortcodesHandle(input, p, template)
|
||||
@@ -21,13 +20,13 @@ func CheckShortCodeMatch(t *testing.T, input, expected string, template bundle.T
|
||||
}
|
||||
|
||||
func TestNonSC(t *testing.T) {
|
||||
tem := bundle.NewTemplate()
|
||||
tem := NewTemplate()
|
||||
|
||||
CheckShortCodeMatch(t, "{{% movie 47238zzb %}}", "{{% movie 47238zzb %}}", tem)
|
||||
}
|
||||
|
||||
func TestPositionalParamSC(t *testing.T) {
|
||||
tem := bundle.NewTemplate()
|
||||
tem := NewTemplate()
|
||||
tem.AddInternalShortcode("video.html", `Playing Video {{ .Get 0 }}`)
|
||||
|
||||
CheckShortCodeMatch(t, "{{% video 47238zzb %}}", "Playing Video 47238zzb", tem)
|
||||
@@ -38,7 +37,7 @@ func TestPositionalParamSC(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestNamedParamSC(t *testing.T) {
|
||||
tem := bundle.NewTemplate()
|
||||
tem := NewTemplate()
|
||||
tem.AddInternalShortcode("img.html", `<img{{ with .Get "src" }} src="{{.}}"{{end}}{{with .Get "class"}} class="{{.}}"{{end}}>`)
|
||||
|
||||
CheckShortCodeMatch(t, `{{% img src="one" %}}`, `<img src="one">`, tem)
|
||||
@@ -50,7 +49,7 @@ func TestNamedParamSC(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestInnerSC(t *testing.T) {
|
||||
tem := bundle.NewTemplate()
|
||||
tem := NewTemplate()
|
||||
tem.AddInternalShortcode("inside.html", `<div{{with .Get "class"}} class="{{.}}"{{end}}>{{ .Inner }}</div>`)
|
||||
|
||||
CheckShortCodeMatch(t, `{{% inside class="aspen" %}}`, `<div class="aspen"></div>`, tem)
|
||||
@@ -59,14 +58,14 @@ func TestInnerSC(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestEmbeddedSC(t *testing.T) {
|
||||
tem := bundle.NewTemplate()
|
||||
tem := NewTemplate()
|
||||
CheckShortCodeMatch(t, "{{% test %}}", "This is a simple Test", tem)
|
||||
CheckShortCodeMatch(t, `{{% figure src="/found/here" class="bananas orange" %}}`, "\n<figure class=\"bananas orange\">\n \n <img src=\"/found/here\" />\n \n \n</figure>\n", tem)
|
||||
CheckShortCodeMatch(t, `{{% figure src="/found/here" class="bananas orange" caption="This is a caption" %}}`, "\n<figure class=\"bananas orange\">\n \n <img src=\"/found/here\" alt=\"This is a caption\" />\n \n \n <figcaption>\n <p>\n This is a caption\n \n \n \n </p> \n </figcaption>\n \n</figure>\n", tem)
|
||||
}
|
||||
|
||||
func TestUnbalancedQuotes(t *testing.T) {
|
||||
tem := bundle.NewTemplate()
|
||||
tem := NewTemplate()
|
||||
|
||||
CheckShortCodeMatch(t, `{{% figure src="/uploads/2011/12/spf13-mongosv-speaking-copy-1024x749.jpg "Steve Francia speaking at OSCON 2012" alt="MongoSV 2011" %}}`, "\n<figure >\n \n <img src=\"/uploads/2011/12/spf13-mongosv-speaking-copy-1024x749.jpg%20%22Steve%20Francia%20speaking%20at%20OSCON%202012\" alt=\"MongoSV 2011\" />\n \n \n</figure>\n", tem)
|
||||
}
|
||||
|
Reference in New Issue
Block a user