mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
bfb9613a14
This commit adds the fast and CommonMark compliant Goldmark as the new default markdown handler in Hugo. If you want to continue using BlackFriday as the default for md/markdown extensions, you can use this configuration: ```toml [markup] defaultMarkdownHandler="blackfriday" ``` Fixes #5963 Fixes #1778 Fixes #6355
255 lines
5.4 KiB
Go
255 lines
5.4 KiB
Go
// Copyright 2017 The Hugo Authors. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package transform
|
|
|
|
import (
|
|
"html/template"
|
|
"testing"
|
|
|
|
"github.com/gohugoio/hugo/common/loggers"
|
|
"github.com/spf13/afero"
|
|
|
|
qt "github.com/frankban/quicktest"
|
|
"github.com/gohugoio/hugo/config"
|
|
"github.com/gohugoio/hugo/deps"
|
|
"github.com/gohugoio/hugo/helpers"
|
|
"github.com/gohugoio/hugo/hugofs"
|
|
"github.com/gohugoio/hugo/langs"
|
|
"github.com/spf13/viper"
|
|
)
|
|
|
|
type tstNoStringer struct{}
|
|
|
|
func TestEmojify(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
v := viper.New()
|
|
ns := New(newDeps(v))
|
|
|
|
for _, test := range []struct {
|
|
s interface{}
|
|
expect interface{}
|
|
}{
|
|
{":notamoji:", template.HTML(":notamoji:")},
|
|
{"I :heart: Hugo", template.HTML("I ❤ Hugo")},
|
|
// errors
|
|
{tstNoStringer{}, false},
|
|
} {
|
|
|
|
result, err := ns.Emojify(test.s)
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
continue
|
|
}
|
|
|
|
c.Assert(err, qt.IsNil)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestHighlight(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
v := viper.New()
|
|
v.Set("contentDir", "content")
|
|
ns := New(newDeps(v))
|
|
|
|
for _, test := range []struct {
|
|
s interface{}
|
|
lang string
|
|
opts string
|
|
expect interface{}
|
|
}{
|
|
{"func boo() {}", "go", "", "boo"},
|
|
// Issue #4179
|
|
{`<Foo attr=" < "></Foo>`, "xml", "", `&lt;`},
|
|
{tstNoStringer{}, "go", "", false},
|
|
} {
|
|
|
|
result, err := ns.Highlight(test.s, test.lang, test.opts)
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
continue
|
|
}
|
|
|
|
c.Assert(err, qt.IsNil)
|
|
c.Assert(string(result), qt.Contains, test.expect.(string))
|
|
}
|
|
}
|
|
|
|
func TestHTMLEscape(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
v := viper.New()
|
|
v.Set("contentDir", "content")
|
|
ns := New(newDeps(v))
|
|
|
|
for _, test := range []struct {
|
|
s interface{}
|
|
expect interface{}
|
|
}{
|
|
{`"Foo & Bar's Diner" <y@z>`, `"Foo & Bar's Diner" <y@z>`},
|
|
{"Hugo & Caddy > Wordpress & Apache", "Hugo & Caddy > Wordpress & Apache"},
|
|
// errors
|
|
{tstNoStringer{}, false},
|
|
} {
|
|
|
|
result, err := ns.HTMLEscape(test.s)
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
continue
|
|
}
|
|
|
|
c.Assert(err, qt.IsNil)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestHTMLUnescape(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
v := viper.New()
|
|
v.Set("contentDir", "content")
|
|
ns := New(newDeps(v))
|
|
|
|
for _, test := range []struct {
|
|
s interface{}
|
|
expect interface{}
|
|
}{
|
|
{`"Foo & Bar's Diner" <y@z>`, `"Foo & Bar's Diner" <y@z>`},
|
|
{"Hugo & Caddy > Wordpress & Apache", "Hugo & Caddy > Wordpress & Apache"},
|
|
// errors
|
|
{tstNoStringer{}, false},
|
|
} {
|
|
|
|
result, err := ns.HTMLUnescape(test.s)
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
continue
|
|
}
|
|
|
|
c.Assert(err, qt.IsNil)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func TestMarkdownify(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
v := viper.New()
|
|
v.Set("contentDir", "content")
|
|
ns := New(newDeps(v))
|
|
|
|
for _, test := range []struct {
|
|
s interface{}
|
|
expect interface{}
|
|
}{
|
|
{"Hello **World!**", template.HTML("Hello <strong>World!</strong>")},
|
|
{[]byte("Hello Bytes **World!**"), template.HTML("Hello Bytes <strong>World!</strong>")},
|
|
{tstNoStringer{}, false},
|
|
} {
|
|
|
|
result, err := ns.Markdownify(test.s)
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
continue
|
|
}
|
|
|
|
c.Assert(err, qt.IsNil)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
// Issue #3040
|
|
func TestMarkdownifyBlocksOfText(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
v := viper.New()
|
|
v.Set("contentDir", "content")
|
|
ns := New(newDeps(v))
|
|
|
|
text := `
|
|
#First
|
|
|
|
This is some *bold* text.
|
|
|
|
## Second
|
|
|
|
This is some more text.
|
|
|
|
And then some.
|
|
`
|
|
|
|
result, err := ns.Markdownify(text)
|
|
c.Assert(err, qt.IsNil)
|
|
c.Assert(result, qt.Equals, template.HTML(
|
|
"<p>#First</p>\n<p>This is some <em>bold</em> text.</p>\n<h2 id=\"second\">Second</h2>\n<p>This is some more text.</p>\n<p>And then some.</p>\n"))
|
|
|
|
}
|
|
|
|
func TestPlainify(t *testing.T) {
|
|
t.Parallel()
|
|
c := qt.New(t)
|
|
|
|
v := viper.New()
|
|
ns := New(newDeps(v))
|
|
|
|
for _, test := range []struct {
|
|
s interface{}
|
|
expect interface{}
|
|
}{
|
|
{"<em>Note:</em> blah <b>blah</b>", "Note: blah blah"},
|
|
// errors
|
|
{tstNoStringer{}, false},
|
|
} {
|
|
|
|
result, err := ns.Plainify(test.s)
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
c.Assert(err, qt.Not(qt.IsNil))
|
|
continue
|
|
}
|
|
|
|
c.Assert(err, qt.IsNil)
|
|
c.Assert(result, qt.Equals, test.expect)
|
|
}
|
|
}
|
|
|
|
func newDeps(cfg config.Provider) *deps.Deps {
|
|
cfg.Set("contentDir", "content")
|
|
cfg.Set("i18nDir", "i18n")
|
|
|
|
l := langs.NewLanguage("en", cfg)
|
|
|
|
cs, err := helpers.NewContentSpec(l, loggers.NewErrorLogger(), afero.NewMemMapFs())
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
return &deps.Deps{
|
|
Cfg: cfg,
|
|
Fs: hugofs.NewMem(l),
|
|
ContentSpec: cs,
|
|
}
|
|
}
|