mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
3752348ef1
The current behaviour addes a `url` attribute to the frontmatter of all posts imported from Jeklly and assumes the desired permalink structure is /:year/:month/:day/:title/. This may be the case for most peeps, but poses a problem for those that don't use this permalink structure as the `url` attribute takes precedence over the `permalink` attribute in the site-wide configuration meaning it can't be overruled. This changes the behaviour to only set the `url` attribute if the `permalink` attribute is set in the Jekyll frontmatter. The duplication of the confirmation message is also removed. Tests have been updated to reflect this change in behaviour. Fixes #1887
126 lines
5.5 KiB
Go
126 lines
5.5 KiB
Go
// Copyright 2015 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 commands
|
|
|
|
import (
|
|
"encoding/json"
|
|
"github.com/stretchr/testify/assert"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestParseJekyllFilename(t *testing.T) {
|
|
filenameArray := []string{
|
|
"2015-01-02-test.md",
|
|
"2012-03-15-中文.markup",
|
|
}
|
|
|
|
expectResult := []struct {
|
|
postDate time.Time
|
|
postName string
|
|
}{
|
|
{time.Date(2015, time.January, 2, 0, 0, 0, 0, time.UTC), "test"},
|
|
{time.Date(2012, time.March, 15, 0, 0, 0, 0, time.UTC), "中文"},
|
|
}
|
|
|
|
for i, filename := range filenameArray {
|
|
postDate, postName, err := parseJekyllFilename(filename)
|
|
assert.Equal(t, err, nil)
|
|
assert.Equal(t, expectResult[i].postDate.Format("2006-01-02"), postDate.Format("2006-01-02"))
|
|
assert.Equal(t, expectResult[i].postName, postName)
|
|
}
|
|
}
|
|
|
|
func TestConvertJekyllMetadata(t *testing.T) {
|
|
testDataList := []struct {
|
|
metadata interface{}
|
|
postName string
|
|
postDate time.Time
|
|
draft bool
|
|
expect string
|
|
}{
|
|
{map[interface{}]interface{}{}, "testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
|
|
`{"date":"2015-10-01T00:00:00Z"}`},
|
|
{map[interface{}]interface{}{}, "testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), true,
|
|
`{"date":"2015-10-01T00:00:00Z","draft":true}`},
|
|
{map[interface{}]interface{}{"Permalink": "/permalink.html", "layout": "post"},
|
|
"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
|
|
`{"date":"2015-10-01T00:00:00Z","url":"/permalink.html"}`},
|
|
{map[interface{}]interface{}{"permalink": "/permalink.html"},
|
|
"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
|
|
`{"date":"2015-10-01T00:00:00Z","url":"/permalink.html"}`},
|
|
{map[interface{}]interface{}{"category": nil, "permalink": 123},
|
|
"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
|
|
`{"date":"2015-10-01T00:00:00Z"}`},
|
|
{map[interface{}]interface{}{"Excerpt_Separator": "sep"},
|
|
"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
|
|
`{"date":"2015-10-01T00:00:00Z","excerpt_separator":"sep"}`},
|
|
{map[interface{}]interface{}{"category": "book", "layout": "post", "Others": "Goods", "Date": "2015-10-01 12:13:11"},
|
|
"testPost", time.Date(2015, 10, 1, 0, 0, 0, 0, time.UTC), false,
|
|
`{"Others":"Goods","categories":["book"],"date":"2015-10-01T12:13:11Z"}`},
|
|
}
|
|
|
|
for _, data := range testDataList {
|
|
result, err := convertJekyllMetaData(data.metadata, data.postName, data.postDate, data.draft)
|
|
assert.Equal(t, nil, err)
|
|
jsonResult, err := json.Marshal(result)
|
|
assert.Equal(t, nil, err)
|
|
assert.Equal(t, data.expect, string(jsonResult))
|
|
}
|
|
}
|
|
|
|
func TestConvertJekyllContent(t *testing.T) {
|
|
testDataList := []struct {
|
|
metadata interface{}
|
|
content string
|
|
expect string
|
|
}{
|
|
{map[interface{}]interface{}{},
|
|
`Test content\n<!-- more -->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
|
|
{map[interface{}]interface{}{},
|
|
`Test content\n<!-- More -->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
|
|
{map[interface{}]interface{}{"excerpt_separator": "<!--sep-->"},
|
|
`Test content\n<!--sep-->\npart2 content`, `Test content\n<!--more-->\npart2 content`},
|
|
{map[interface{}]interface{}{}, "{% raw %}text{% endraw %}", "text"},
|
|
{map[interface{}]interface{}{}, "{%raw%} text2 {%endraw %}", "text2"},
|
|
{map[interface{}]interface{}{},
|
|
"{% highlight go %}\nvar s int\n{% endhighlight %}",
|
|
"{{< highlight go >}}\nvar s int\n{{< / highlight >}}"},
|
|
|
|
// Octopress image tag
|
|
{map[interface{}]interface{}{},
|
|
"{% img http://placekitten.com/890/280 %}",
|
|
"{{< figure src=\"http://placekitten.com/890/280\" >}}"},
|
|
{map[interface{}]interface{}{},
|
|
"{% img left http://placekitten.com/320/250 Place Kitten #2 %}",
|
|
"{{< figure class=\"left\" src=\"http://placekitten.com/320/250\" title=\"Place Kitten #2\" >}}"},
|
|
{map[interface{}]interface{}{},
|
|
"{% img right http://placekitten.com/300/500 150 250 'Place Kitten #3' %}",
|
|
"{{< figure class=\"right\" src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #3\" >}}"},
|
|
{map[interface{}]interface{}{},
|
|
"{% img right http://placekitten.com/300/500 150 250 'Place Kitten #4' 'An image of a very cute kitten' %}",
|
|
"{{< figure class=\"right\" src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
|
|
{map[interface{}]interface{}{},
|
|
"{% img http://placekitten.com/300/500 150 250 'Place Kitten #4' 'An image of a very cute kitten' %}",
|
|
"{{< figure src=\"http://placekitten.com/300/500\" width=\"150\" height=\"250\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
|
|
{map[interface{}]interface{}{},
|
|
"{% img right /placekitten/300/500 'Place Kitten #4' 'An image of a very cute kitten' %}",
|
|
"{{< figure class=\"right\" src=\"/placekitten/300/500\" title=\"Place Kitten #4\" alt=\"An image of a very cute kitten\" >}}"},
|
|
}
|
|
|
|
for _, data := range testDataList {
|
|
result := convertJekyllContent(data.metadata, data.content)
|
|
assert.Equal(t, data.expect, result)
|
|
}
|
|
}
|