github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity
hugo/hugolib/page_test.go

1650 lines
49 KiB
Go
Raw Normal View History

Add copyright header to that source files that don’t have one. See #1646
2015-12-10 17:19:38 -05:00
// 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.
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
package hugolib
import (
hugolib: Clean up a benchmark
2017-01-02 05:44:17 -05:00
"bytes"
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
"fmt"
gofmt all go code
2014-01-29 17:50:31 -05:00
"html/template"
hugolib: Clean up a benchmark
2017-01-02 05:44:17 -05:00
"os"
converted path 2 filepath
2014-11-06 11:52:01 -05:00
"path/filepath"
Fix for page.GetParam() for JSON and TOML maps Setting per-page Blackfriday angledQuotes did not work with TOML or JSON front matter, but it does work with YAML. It turns out that page.Params("blackfriday") returns type map[interface{}]interface{} for YAML, but type map[string]interface{} for JSON and TOML. This patch updates page.GetParam() to catch the latter, with an error message if page.GetParam() does not recognize a type. A test is also added.
2015-01-24 06:44:35 -05:00
"reflect"
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
"sort"
gofmt all go code
2014-01-29 17:50:31 -05:00
"strings"
"testing"
"time"
Big refactor of how source files are used. Also added default destination extension option.
2014-10-16 20:20:09 -04:00
all: Update import paths to gohugoio/hugo
2017-06-13 12:42:45 -04:00
"github.com/gohugoio/hugo/deps"
"github.com/gohugoio/hugo/helpers"
Run gofmt to get imports in line vs gohugoio/hugo
2017-06-13 13:07:35 -04:00
"github.com/spf13/cast"
Add IsHome To determine if a page is the "Home Page" has inspired lots of creativity in the template department. This commit makes it simpler: IsHome will tell the truth.
2015-05-27 21:19:59 -04:00
"github.com/stretchr/testify/assert"
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
"github.com/stretchr/testify/require"
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
)
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
var emptyPage = ""
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
Add IsRenderable to Page As pages are read from the target, they will be assessed if they should be rendered or not. The logic for IsRenderable is in the parser/page.go and looks for anything exception '<'.
2013-09-18 13:17:43 -04:00
const (
hugolib: Add test for homepage content for all rendering engines Update #4166
2017-12-29 04:16:50 -05:00
homePage = "---\ntitle: Home\n---\nHome Page Content\n"
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePage = "---\ntitle: Simple\n---\nSimple Page\n"
invalidFrontMatterMissing = "This is a test"
renderNoFrontmatter = "<!doctype><html><head></head><body>This is a test</body></html>"
contentWithCommentedFrontmatter = "<!--\n+++\ntitle = \"Network configuration\"\ndescription = \"Docker networking\"\nkeywords = [\"network\"]\n[menu.main]\nparent= \"smn_administrate\"\n+++\n-->\n\n# Network configuration\n\n##\nSummary"
contentWithCommentedTextFrontmatter = "<!--[metaData]>\n+++\ntitle = \"Network configuration\"\ndescription = \"Docker networking\"\nkeywords = [\"network\"]\n[menu.main]\nparent= \"smn_administrate\"\n+++\n<![end-metadata]-->\n\n# Network configuration\n\n##\nSummary"
contentWithCommentedLongFrontmatter = "<!--[metaData123456789012345678901234567890]>\n+++\ntitle = \"Network configuration\"\ndescription = \"Docker networking\"\nkeywords = [\"network\"]\n[menu.main]\nparent= \"smn_administrate\"\n+++\n<![end-metadata]-->\n\n# Network configuration\n\n##\nSummary"
contentWithCommentedLong2Frontmatter = "<!--[metaData]>\n+++\ntitle = \"Network configuration\"\ndescription = \"Docker networking\"\nkeywords = [\"network\"]\n[menu.main]\nparent= \"smn_administrate\"\n+++\n<![end-metadata123456789012345678901234567890]-->\n\n# Network configuration\n\n##\nSummary"
invalidFrontmatterShortDelim = `
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
--
title: Short delim start
---
Short Delim
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
invalidFrontmatterShortDelimEnding = `
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
---
title: Short delim ending
--
Short Delim
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
invalidFrontmatterLadingWs = `
Further work on path/section stuff. Tests passing now.
2013-08-14 08:57:14 -04:00
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
---
title: Leading WS
---
Leading
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageJSON = `
Adding more test cases
2013-08-07 02:04:49 -04:00
{
"title": "spf13-vim 3.0 release and new website",
"description": "spf13-vim is a cross platform distribution of vim plugins and resources for Vim.",
fix tags not being in lowercase, #491
2014-09-09 16:58:02 -04:00
"tags": [ ".vimrc", "plugins", "spf13-vim", "VIm" ],
Adding more test cases
2013-08-07 02:04:49 -04:00
"date": "2012-04-06",
"categories": [
"Development",
"VIM"
],
#462 fix, remove leading and trailing dashes from urlized slug. includes test changes
2014-10-02 18:25:52 -04:00
"slug": "-spf13-vim-3-0-release-and-new-website-"
Adding more test cases
2013-08-07 02:04:49 -04:00
}
Switching to the rjson library which is more friendly to human generated json.
2013-10-01 22:45:24 -04:00
Content of the file goes Here
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageRFC3339Date = "---\ntitle: RFC3339 Date\ndate: \"2013-05-17T16:59:30Z\"\n---\nrfc3339 content"
simplePageJSONMultiple = `
Adding more test cases
2013-08-07 02:04:49 -04:00
{
"title": "foobar",
"customData": { "foo": "bar" },
"date": "2012-08-06"
}
Some text
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithSummaryDelimiter = `---
Wordpress summaries Allow full control of summaries which can be rendered as html rather than text. Using a `<!--more-->` html comment in your markdown / rst you can indiciate where the summary should end and have the summary converted to html. Signed-off-by: Noah Campbell <noahcampbell@gmail.com> Conflicts: hugolib/page_test.go
2013-08-21 05:37:14 -04:00
title: Simple
---
Fix parsing edge case of frontmatter When the frontmatter contains a - (or other delimiter) close to the closing frontmatter delimiter, frontmatter detection would fail.
2013-09-18 12:15:46 -04:00
Summary Next Line
Wordpress summaries Allow full control of summaries which can be rendered as html rather than text. Using a `<!--more-->` html comment in your markdown / rst you can indiciate where the summary should end and have the summary converted to html. Signed-off-by: Noah Campbell <noahcampbell@gmail.com> Conflicts: hugolib/page_test.go
2013-08-21 05:37:14 -04:00
<!--more-->
Restoring former snippet behavior & adding test to ensure future behavior
2013-10-04 12:28:28 -04:00
Some more text
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
`
simplePageWithSummaryDelimiterAndMarkdownThatCrossesBorder = `---
title: Simple
---
The [best static site generator][hugo].[^1]
<!--more-->
[hugo]: http://gohugo.io/
[^1]: Many people say so.
Restoring former snippet behavior & adding test to ensure future behavior
2013-10-04 12:28:28 -04:00
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithShortcodeInSummary = `---
Restoring former snippet behavior & adding test to ensure future behavior
2013-10-04 12:28:28 -04:00
title: Simple
---
Shortcode rewrite, take 2 This commit contains a restructuring and partial rewrite of the shortcode handling. Prior to this commit rendering of the page content was mingled with handling of the shortcodes. This led to several oddities. The new flow is: 1. Shortcodes are extracted from page and replaced with placeholders. 2. Shortcodes are processed and rendered 3. Page is processed 4. The placeholders are replaced with the rendered shortcodes The handling of summaries is also made simpler by this. This commit also introduces some other chenges: 1. distinction between shortcodes that need further processing and those who do not: * `{{< >}}`: Typically raw HTML. Will not be processed. * `{{% %}}`: Will be processed by the page's markup engine (Markdown or (infuture) Asciidoctor) The above also involves a new shortcode-parser, with lexical scanning inspired by Rob Pike's talk called "Lexical Scanning in Go", which should be easier to understand, give better error messages and perform better. 2. If you want to exclude a shortcode from being processed (for documentation etc.), the inner part of the shorcode must be commented out, i.e. `{{%/* movie 47238zzb */%}}`. See the updated shortcode section in the documentation for further examples. The new parser supports nested shortcodes. This isn't new, but has two related design choices worth mentioning: * The shortcodes will be rendered individually, so If both `{{< >}}` and `{{% %}}` are used in the nested hierarchy, one will be passed through the page's markdown processor, the other not. * To avoid potential costly overhead of always looking far ahead for a possible closing tag, this implementation looks at the template itself, and is branded as a container with inner content if it contains a reference to `.Inner` Fixes #565 Fixes #480 Fixes #461 And probably some others.
2014-10-27 16:48:30 -04:00
Summary Next Line. {{<figure src="/not/real" >}}.
Restoring former snippet behavior & adding test to ensure future behavior
2013-10-04 12:28:28 -04:00
More text here.
Wordpress summaries Allow full control of summaries which can be rendered as html rather than text. Using a `<!--more-->` html comment in your markdown / rst you can indiciate where the summary should end and have the summary converted to html. Signed-off-by: Noah Campbell <noahcampbell@gmail.com> Conflicts: hugolib/page_test.go
2013-08-21 05:37:14 -04:00
Some more text
Support embedding <script> tags in markdown pages
2014-05-29 23:42:12 -04:00
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithEmbeddedScript = `---
Support embedding <script> tags in markdown pages
2014-05-29 23:42:12 -04:00
title: Simple
---
<script type='text/javascript'>alert('the script tags are still there, right?');</script>
Wordpress summaries Allow full control of summaries which can be rendered as html rather than text. Using a `<!--more-->` html comment in your markdown / rst you can indiciate where the summary should end and have the summary converted to html. Signed-off-by: Noah Campbell <noahcampbell@gmail.com> Conflicts: hugolib/page_test.go
2013-08-21 05:37:14 -04:00
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithSummaryDelimiterSameLine = `---
The <!--more--> (summary divider) now works even if it is on the same line as content Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 00:07:22 -04:00
title: Simple
---
Fix parsing edge case of frontmatter When the frontmatter contains a - (or other delimiter) close to the closing frontmatter delimiter, frontmatter detection would fail.
2013-09-18 12:15:46 -04:00
Summary Same Line<!--more-->
The <!--more--> (summary divider) now works even if it is on the same line as content Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 00:07:22 -04:00
Some more text
hugolib: Fix regression of .Truncated evaluation in manual summaries This fixes the behavior of .Truncated that was introduced with commit bef496b97e1dc2df8c52b080152d539a58752801 which was later broken. The desired behavior is that .Truncated would evaluate to false when there was nothing after the user defined summary marker. This also adds a simple unit test to ensure that this feature isn't broken again. The check for content after the user defined summary marker is done on the raw content instead of the working copy because some of the markup renderers add elements after the marker, making it difficult to determine if there is actually any content. The behavior (evaluating to false when there is no content, just summary) is also now documented.
2017-01-26 14:58:25 -05:00
`
simplePageWithSummaryDelimiterOnlySummary = `---
title: Simple
---
Summary text
<!--more-->
Add RuneCount to Page Fixes #1266
2015-07-12 05:05:37 -04:00
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithAllCJKRunes = `---
Add RuneCount to Page Fixes #1266
2015-07-12 05:05:37 -04:00
title: Simple
---
€ € € € €
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
你好
도형이
カテゴリー
Add RuneCount to Page Fixes #1266
2015-07-12 05:05:37 -04:00
Wordcount restored. fixed #92
2013-10-15 09:15:52 -04:00
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithMainEnglishWithCJKRunes = `---
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
title: Simple
---
In Chinese, 好 means good. In Chinese, 好 means good.
In Chinese, 好 means good. In Chinese, 好 means good.
In Chinese, 好 means good. In Chinese, 好 means good.
In Chinese, 好 means good. In Chinese, 好 means good.
In Chinese, 好 means good. In Chinese, 好 means good.
In Chinese, 好 means good. In Chinese, 好 means good.
In Chinese, 好 means good. In Chinese, 好 means good.
More then 70 words.
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithMainEnglishWithCJKRunesSummary = "In Chinese, 好 means good. In Chinese, 好 means good. " +
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good. " +
"In Chinese, 好 means good. In Chinese, 好 means good."
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithIsCJKLanguageFalse = `---
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
title: Simple
isCJKLanguage: false
---
In Chinese, 好的啊 means good. In Chinese, 好的呀 means good.
In Chinese, 好的啊 means good. In Chinese, 好的呀 means good.
In Chinese, 好的啊 means good. In Chinese, 好的呀 means good.
In Chinese, 好的啊 means good. In Chinese, 好的呀 means good.
In Chinese, 好的啊 means good. In Chinese, 好的呀 means good.
In Chinese, 好的啊 means good. In Chinese, 好的呀 means good.
In Chinese, 好的啊 means good. In Chinese, 好的呀呀 means good enough.
More then 70 words.
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithIsCJKLanguageFalseSummary = "In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀 means good. " +
"In Chinese, 好的啊 means good. In Chinese, 好的呀呀 means good enough."
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithLongContent = `---
Wordcount restored. fixed #92
2013-10-15 09:15:52 -04:00
title: Simple
---
Moved TOC test into page_test. Some general page_test cleanup.
2014-01-28 23:09:24 -05:00
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit
amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet,
consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco
laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia
deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur
adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna
aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi
ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in
voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint
occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim
id est laborum. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed
do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim
veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem
ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis
nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit
amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore
et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation
ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor
in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui
officia deserunt mollit anim id est laborum.`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
pageWithToC = `---
Moved TOC test into page_test. Some general page_test cleanup.
2014-01-28 23:09:24 -05:00
title: TOC
---
For some moments the old man did not reply. He stood with bowed head, buried in deep thought. But at last he spoke.
## AA
I have no idea, of course, how long it took me to reach the limit of the plain,
but at last I entered the foothills, following a pretty little canyon upward
toward the mountains. Beside me frolicked a laughing brooklet, hurrying upon
its noisy way down to the silent sea. In its quieter pools I discovered many
small fish, of four-or five-pound weight I should imagine. In appearance,
except as to size and color, they were not unlike the whale of our own seas. As
I watched them playing about I discovered, not only that they suckled their
young, but that at intervals they rose to the surface to breathe as well as to
feed upon certain grasses and a strange, scarlet lichen which grew upon the
rocks just above the water line.
### AAA
I remember I felt an extraordinary persuasion that I was being played with,
that presently, when I was upon the very verge of safety, this mysterious
death--as swift as the passage of light--would leap after me from the pit about
the cylinder and strike me down. ## BB
### BBB
"You're a great Granser," he cried delightedly, "always making believe them little marks mean something."
Add site-wide/per-page [blackfriday] `extensions` option
2015-01-25 06:08:02 -05:00
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithAdditionalExtension = `+++
Add site-wide/per-page [blackfriday] `extensions` option
2015-01-25 06:08:02 -05:00
[blackfriday]
extensions = ["hardLineBreak"]
+++
first line.
second line.
fourth line.
The <!--more--> (summary divider) now works even if it is on the same line as content Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 00:07:22 -04:00
`
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithURL = `---
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
title: Simple
url: simple/url/
---
Simple Page With URL`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithSlug = `---
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
title: Simple
slug: simple-slug
---
Simple Page With Slug`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
simplePageWithDate = `---
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
title: Simple
date: '2013-10-15T06:16:13'
---
Simple Page With Date`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
UTF8Page = `---
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
title: ラーメン
---
UTF8 Page`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
UTF8PageWithURL = `---
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
title: ラーメン
url: ラーメン/url/
---
UTF8 Page With URL`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
UTF8PageWithSlug = `---
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
title: ラーメン
slug: ラーメン-slug
---
UTF8 Page With Slug`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
UTF8PageWithDate = `---
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
title: ラーメン
date: '2013-10-15T06:16:13'
---
UTF8 Page With Date`
Add IsRenderable to Page As pages are read from the target, they will be assessed if they should be rendered or not. The logic for IsRenderable is in the parser/page.go and looks for anything exception '<'.
2013-09-18 13:17:43 -04:00
)
The <!--more--> (summary divider) now works even if it is on the same line as content Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 00:07:22 -04:00
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
var pageWithVariousFrontmatterTypes = `+++
Adding support for more front matter types (int, float & date)
2013-10-24 17:31:04 -04:00
a_string = "bar"
an_integer = 1
a_float = 1.3
Adding support for boolean params
2014-01-28 23:24:59 -05:00
a_bool = false
Adding support for more front matter types (int, float & date)
2013-10-24 17:31:04 -04:00
a_date = 1979-05-27T07:32:00Z
Fix for page.GetParam() for JSON and TOML maps Setting per-page Blackfriday angledQuotes did not work with TOML or JSON front matter, but it does work with YAML. It turns out that page.Params("blackfriday") returns type map[interface{}]interface{} for YAML, but type map[string]interface{} for JSON and TOML. This patch updates page.GetParam() to catch the latter, with an error message if page.GetParam() does not recognize a type. A test is also added.
2015-01-24 06:44:35 -05:00
[a_table]
a_key = "a_value"
Adding support for more front matter types (int, float & date)
2013-10-24 17:31:04 -04:00
+++
Front Matter with various frontmatter types`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
var pageWithCalendarYAMLFrontmatter = `---
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
type: calendar
weeks:
-
start: "Jan 5"
days:
- activity: class
room: EN1000
- activity: lab
- activity: class
- activity: lab
- activity: class
-
start: "Jan 12"
days:
- activity: class
- activity: lab
- activity: class
- activity: lab
- activity: exam
---
Hi.
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
var pageWithCalendarJSONFrontmatter = `{
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
"type": "calendar",
"weeks": [
{
"start": "Jan 5",
"days": [
{ "activity": "class", "room": "EN1000" },
{ "activity": "lab" },
{ "activity": "class" },
{ "activity": "lab" },
{ "activity": "class" }
]
},
{
"start": "Jan 12",
"days": [
{ "activity": "class" },
{ "activity": "lab" },
{ "activity": "class" },
{ "activity": "lab" },
{ "activity": "exam" }
]
}
]
}
Hi.
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
var pageWithCalendarTOMLFrontmatter = `+++
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
type = "calendar"
[[weeks]]
start = "Jan 5"
[[weeks.days]]
activity = "class"
room = "EN1000"
[[weeks.days]]
activity = "lab"
[[weeks.days]]
activity = "class"
[[weeks.days]]
activity = "lab"
[[weeks.days]]
activity = "class"
[[weeks]]
start = "Jan 12"
[[weeks.days]]
activity = "class"
[[weeks.days]]
activity = "lab"
[[weeks.days]]
activity = "class"
[[weeks.days]]
activity = "lab"
[[weeks.days]]
activity = "exam"
+++
Hi.
`
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
func checkError(t *testing.T, err error, expected string) {
gofmt all go code
2014-01-29 17:50:31 -05:00
if err == nil {
t.Fatalf("err is nil. Expected: %s", expected)
}
if err.Error() != expected {
t.Errorf("err.Error() returned: '%s'. Expected: '%s'", err.Error(), expected)
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
func TestDegenerateEmptyPageZeroLengthName(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
_, err := s.NewPage("")
gofmt all go code
2014-01-29 17:50:31 -05:00
if err == nil {
t.Fatalf("A zero length page name must return an error")
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
gofmt all go code
2014-01-29 17:50:31 -05:00
checkError(t, err, "Zero length page name")
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
func TestDegenerateEmptyPage(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
_, err := s.NewPageFrom(strings.NewReader(emptyPage), "test")
gofmt all go code
2014-01-29 17:50:31 -05:00
if err != nil {
t.Fatalf("Empty files should not trigger an error. Should be able to touch a file while watching without erroring out.")
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
func checkPageTitle(t *testing.T, page *Page, title string) {
gofmt all go code
2014-01-29 17:50:31 -05:00
if page.Title != title {
t.Fatalf("Page title is: %s. Expected %s", page.Title, title)
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
func checkPageContent(t *testing.T, page *Page, content string, msg ...interface{}) {
a := normalizeContent(content)
b := normalizeContent(string(page.Content))
if a != b {
t.Fatalf("Page content is:\n%q\nExpected:\n%q (%q)", b, a, msg)
gofmt all go code
2014-01-29 17:50:31 -05:00
}
Moved TOC test into page_test. Some general page_test cleanup.
2014-01-28 23:09:24 -05:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
func normalizeContent(c string) string {
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
norm := c
norm = strings.Replace(norm, "\n", " ", -1)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
norm = strings.Replace(norm, " ", " ", -1)
norm = strings.Replace(norm, " ", " ", -1)
norm = strings.Replace(norm, " ", " ", -1)
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
norm = strings.Replace(norm, "p> ", "p>", -1)
norm = strings.Replace(norm, "> <", "> <", -1)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
return strings.TrimSpace(norm)
}
Moved TOC test into page_test. Some general page_test cleanup.
2014-01-28 23:09:24 -05:00
func checkPageTOC(t *testing.T, page *Page, toc string) {
gofmt all go code
2014-01-29 17:50:31 -05:00
if page.TableOfContents != template.HTML(toc) {
t.Fatalf("Page TableOfContents is: %q.\nExpected %q", page.TableOfContents, toc)
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
func checkPageSummary(t *testing.T, page *Page, summary string, msg ...interface{}) {
a := normalizeContent(string(page.Summary))
b := normalizeContent(summary)
if a != b {
t.Fatalf("Page summary is:\n%q.\nExpected\n%q (%q)", a, b, msg)
gofmt all go code
2014-01-29 17:50:31 -05:00
}
Wordpress summaries Allow full control of summaries which can be rendered as html rather than text. Using a `<!--more-->` html comment in your markdown / rst you can indiciate where the summary should end and have the summary converted to html. Signed-off-by: Noah Campbell <noahcampbell@gmail.com> Conflicts: hugolib/page_test.go
2013-08-21 05:37:14 -04:00
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
func checkPageType(t *testing.T, page *Page, pageType string) {
gofmt all go code
2014-01-29 17:50:31 -05:00
if page.Type() != pageType {
t.Fatalf("Page type is: %s. Expected: %s", page.Type(), pageType)
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
Date rendering unit tests in pages Tests to ensure rendering dates in templates is working correctly. Actually, I was running into invalid templates not giving warnings when I was trying to render a date.
2013-09-03 17:51:06 -04:00
func checkPageDate(t *testing.T, page *Page, time time.Time) {
gofmt all go code
2014-01-29 17:50:31 -05:00
if page.Date != time {
t.Fatalf("Page date is: %s. Expected: %s", page.Date, time)
}
Date rendering unit tests in pages Tests to ensure rendering dates in templates is working correctly. Actually, I was running into invalid templates not giving warnings when I was trying to render a date.
2013-09-03 17:51:06 -04:00
}
Truncated; .Site.Params; First function * Add `.Truncated` bool to each page; will be set true if the `.Summary` is truncated and it's worth showing a "more" link of some kind. * Add `Params` to the site config, defining `.Site.Params` accessible to each page; this lets the site maintainer associate arbitrary data with names, on a site-wide basis. * Provide a `First` function to templates: * Use-case: `{{range First 5 .Site.Recent}}` or anything else which is a simple iterable provided by hugolib * Tests by me for `.Truncated` and `First` Also @noahcampbell contributed towards this: * Add UnitTest for `.Site.Params`: > Digging into this test case a bit more, I'm realizing that we need > to create a param test case to ensure that for each type we render > (page, index, homepage, rss, etc.) that the proper fields are > represented. This will help us refactor without fear in the > future. Sample config.yaml: ```yaml title: "Test site" params: Subtitle: "More tests always good" AuthorName: "John Doe" SidebarRecentLimit: 5 ``` Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-11-10 15:04:51 -05:00
func checkTruncation(t *testing.T, page *Page, shouldBe bool, msg string) {
gofmt all go code
2014-01-29 17:50:31 -05:00
if page.Summary == "" {
t.Fatal("page has no summary, can not check truncation")
}
if page.Truncated != shouldBe {
if shouldBe {
t.Fatalf("page wasn't truncated: %s", msg)
} else {
t.Fatalf("page was truncated: %s", msg)
}
}
Truncated; .Site.Params; First function * Add `.Truncated` bool to each page; will be set true if the `.Summary` is truncated and it's worth showing a "more" link of some kind. * Add `Params` to the site config, defining `.Site.Params` accessible to each page; this lets the site maintainer associate arbitrary data with names, on a site-wide basis. * Provide a `First` function to templates: * Use-case: `{{range First 5 .Site.Recent}}` or anything else which is a simple iterable provided by hugolib * Tests by me for `.Truncated` and `First` Also @noahcampbell contributed towards this: * Add UnitTest for `.Site.Params`: > Digging into this test case a bit more, I'm realizing that we need > to create a param test case to ensure that for each type we render > (page, index, homepage, rss, etc.) that the proper fields are > represented. This will help us refactor without fear in the > future. Sample config.yaml: ```yaml title: "Test site" params: Subtitle: "More tests always good" AuthorName: "John Doe" SidebarRecentLimit: 5 ``` Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-11-10 15:04:51 -05:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
func normalizeExpected(ext, str string) string {
str = normalizeContent(str)
switch ext {
default:
return str
case "html":
return strings.Trim(helpers.StripHTML(str), " ")
case "ad":
paragraphs := strings.Split(str, "</p>")
expected := ""
for _, para := range paragraphs {
if para == "" {
continue
}
expected += fmt.Sprintf("<div class=\"paragraph\">\n%s</p></div>\n", para)
}
return expected
case "rst":
return fmt.Sprintf("<div class=\"document\">\n\n\n%s</div>", str)
}
}
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
func testAllMarkdownEnginesForPages(t *testing.T,
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
assertFunc func(t *testing.T, ext string, pages Pages), settings map[string]interface{}, pageSources ...string) {
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
engines := []struct {
ext string
shouldExecute func() bool
}{
{"md", func() bool { return true }},
{"mmark", func() bool { return true }},
Add Pandoc support, refactor external helpers Recognize the Pandoc format under the file extension .pandoc or .pdc, and shell out to pandoc as an external helper to format Pandoc content. Refactor out repeated code with external helpers. Change the error output formatting. I did not see any of the external helpers print the string "<input>" to represent stdin as a file; just prepending the file name to error output is more general and doesn't sacrifice that much in terms of readability. Closes #234
2017-11-30 06:15:52 -05:00
{"ad", func() bool { return helpers.HasAsciidoc() }},
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
// TODO(bep) figure a way to include this without too much work.{"html", func() bool { return true }},
{"rst", func() bool { return helpers.HasRst() }},
}
for _, e := range engines {
if !e.shouldExecute() {
continue
}
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
2017-02-04 22:20:06 -05:00
cfg, fs := newTestCfg()
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
if settings != nil {
for k, v := range settings {
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
2017-02-04 22:20:06 -05:00
cfg.Set(k, v)
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
}
}
contentDir := "content"
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
2017-02-04 22:20:06 -05:00
if s := cfg.GetString("contentDir"); s != "" {
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
contentDir = s
}
var fileSourcePairs []string
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
for i, source := range pageSources {
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
fileSourcePairs = append(fileSourcePairs, fmt.Sprintf("p%d.%s", i, e.ext), source)
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
for i := 0; i < len(fileSourcePairs); i += 2 {
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
writeSource(t, fs, filepath.Join(contentDir, fileSourcePairs[i]), fileSourcePairs[i+1])
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
}
hugolib: Add test for homepage content for all rendering engines Update #4166
2017-12-29 04:16:50 -05:00
// Add a content page for the home page
homePath := fmt.Sprintf("_index.%s", e.ext)
writeSource(t, fs, filepath.Join(contentDir, homePath), homePage)
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
2017-02-04 22:20:06 -05:00
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
require.Len(t, s.RegularPages, len(pageSources))
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
assertFunc(t, e.ext, s.RegularPages)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
hugolib: Add test for homepage content for all rendering engines Update #4166
2017-12-29 04:16:50 -05:00
home, err := s.Info.Home()
require.NoError(t, err)
require.NotNil(t, home)
require.Equal(t, homePath, home.Path())
require.Contains(t, home.Content, "Home Page Content")
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
func TestCreateNewPage(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
Make it clear that Path is relative to content root Fixes #2290
2016-10-28 04:35:19 -04:00
// issue #2290: Path is relative to the content dir and will continue to be so.
require.Equal(t, filepath.FromSlash(fmt.Sprintf("p0.%s", ext)), p.Path())
node to page: Basic outline Updates #2297
2016-10-30 12:59:24 -04:00
assert.False(t, p.IsHome())
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
checkPageTitle(t, p, "Simple")
checkPageContent(t, p, normalizeExpected(ext, "<p>Simple Page</p>\n"))
checkPageSummary(t, p, "Simple Page")
checkPageType(t, p, "page")
checkTruncation(t, p, false, "simple short page")
gofmt all go code
2014-01-29 17:50:31 -05:00
}
Add IsHome To determine if a page is the "Home Page" has inspired lots of creativity in the template department. This commit makes it simpler: IsHome will tell the truth.
2015-05-27 21:19:59 -04:00
Make it clear that Path is relative to content root Fixes #2290
2016-10-28 04:35:19 -04:00
settings := map[string]interface{}{
"contentDir": "mycontent",
}
testAllMarkdownEnginesForPages(t, assertFunc, settings, simplePage)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
func TestSplitSummaryAndContent(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
for i, this := range []struct {
hugolib: Fix regression of .Truncated evaluation in manual summaries This fixes the behavior of .Truncated that was introduced with commit bef496b97e1dc2df8c52b080152d539a58752801 which was later broken. The desired behavior is that .Truncated would evaluate to false when there was nothing after the user defined summary marker. This also adds a simple unit test to ensure that this feature isn't broken again. The check for content after the user defined summary marker is done on the raw content instead of the working copy because some of the markup renderers add elements after the marker, making it difficult to determine if there is actually any content. The behavior (evaluating to false when there is no content, just summary) is also now documented.
2017-01-26 14:58:25 -05:00
markup string
content string
expectedSummary string
expectedContent string
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}{
{"markdown", `<p>Summary Same LineHUGOMORE42</p>
hugolib: Fix regression of .Truncated evaluation in manual summaries This fixes the behavior of .Truncated that was introduced with commit bef496b97e1dc2df8c52b080152d539a58752801 which was later broken. The desired behavior is that .Truncated would evaluate to false when there was nothing after the user defined summary marker. This also adds a simple unit test to ensure that this feature isn't broken again. The check for content after the user defined summary marker is done on the raw content instead of the working copy because some of the markup renderers add elements after the marker, making it difficult to determine if there is actually any content. The behavior (evaluating to false when there is no content, just summary) is also now documented.
2017-01-26 14:58:25 -05:00
<p>Some more text</p>`, "<p>Summary Same Line</p>", "<p>Summary Same Line</p>\n\n<p>Some more text</p>"},
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
{"asciidoc", `<div class="paragraph"><p>sn</p></div><div class="paragraph"><p>HUGOMORE42Some more text</p></div>`,
"<div class=\"paragraph\"><p>sn</p></div>",
hugolib: Fix regression of .Truncated evaluation in manual summaries This fixes the behavior of .Truncated that was introduced with commit bef496b97e1dc2df8c52b080152d539a58752801 which was later broken. The desired behavior is that .Truncated would evaluate to false when there was nothing after the user defined summary marker. This also adds a simple unit test to ensure that this feature isn't broken again. The check for content after the user defined summary marker is done on the raw content instead of the working copy because some of the markup renderers add elements after the marker, making it difficult to determine if there is actually any content. The behavior (evaluating to false when there is no content, just summary) is also now documented.
2017-01-26 14:58:25 -05:00
"<div class=\"paragraph\"><p>sn</p></div><div class=\"paragraph\"><p>Some more text</p></div>"},
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
{"rst",
"<div class=\"document\"><p>Summary Next Line</p><p>HUGOMORE42Some more text</p></div>",
"<div class=\"document\"><p>Summary Next Line</p></div>",
hugolib: Fix regression of .Truncated evaluation in manual summaries This fixes the behavior of .Truncated that was introduced with commit bef496b97e1dc2df8c52b080152d539a58752801 which was later broken. The desired behavior is that .Truncated would evaluate to false when there was nothing after the user defined summary marker. This also adds a simple unit test to ensure that this feature isn't broken again. The check for content after the user defined summary marker is done on the raw content instead of the working copy because some of the markup renderers add elements after the marker, making it difficult to determine if there is actually any content. The behavior (evaluating to false when there is no content, just summary) is also now documented.
2017-01-26 14:58:25 -05:00
"<div class=\"document\"><p>Summary Next Line</p><p>Some more text</p></div>"},
{"markdown", "<p>a</p><p>b</p><p>HUGOMORE42c</p>", "<p>a</p><p>b</p>", "<p>a</p><p>b</p><p>c</p>"},
{"markdown", "<p>a</p><p>b</p><p>cHUGOMORE42</p>", "<p>a</p><p>b</p><p>c</p>", "<p>a</p><p>b</p><p>c</p>"},
{"markdown", "<p>a</p><p>bHUGOMORE42</p><p>c</p>", "<p>a</p><p>b</p>", "<p>a</p><p>b</p><p>c</p>"},
{"markdown", "<p>aHUGOMORE42</p><p>b</p><p>c</p>", "<p>a</p>", "<p>a</p><p>b</p><p>c</p>"},
{"markdown", " HUGOMORE42 ", "", ""},
{"markdown", "HUGOMORE42", "", ""},
{"markdown", "<p>HUGOMORE42", "<p>", "<p>"},
{"markdown", "HUGOMORE42<p>", "", "<p>"},
{"markdown", "\n\n<p>HUGOMORE42</p>\n", "<p></p>", "<p></p>"},
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
// Issue #2586
// Note: Hugo will not split mid-sentence but will look for the closest
// paragraph end marker. This may be a change from Hugo 0.16, but it makes sense.
{"markdown", `<p>this is an example HUGOMORE42of the issue.</p>`,
"<p>this is an example of the issue.</p>",
hugolib: Fix regression of .Truncated evaluation in manual summaries This fixes the behavior of .Truncated that was introduced with commit bef496b97e1dc2df8c52b080152d539a58752801 which was later broken. The desired behavior is that .Truncated would evaluate to false when there was nothing after the user defined summary marker. This also adds a simple unit test to ensure that this feature isn't broken again. The check for content after the user defined summary marker is done on the raw content instead of the working copy because some of the markup renderers add elements after the marker, making it difficult to determine if there is actually any content. The behavior (evaluating to false when there is no content, just summary) is also now documented.
2017-01-26 14:58:25 -05:00
"<p>this is an example of the issue.</p>"},
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
// Issue: #2538
{"markdown", fmt.Sprintf(` <p class="lead">%s</p>HUGOMORE42<p>%s</p>
`,
strings.Repeat("A", 10), strings.Repeat("B", 31)),
fmt.Sprintf(`<p class="lead">%s</p>`, strings.Repeat("A", 10)),
fmt.Sprintf(`<p class="lead">%s</p><p>%s</p>`, strings.Repeat("A", 10), strings.Repeat("B", 31)),
},
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
} {
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
sc, err := splitUserDefinedSummaryAndContent(this.markup, []byte(this.content))
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
require.NoError(t, err)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
require.NotNil(t, sc, fmt.Sprintf("[%d] Nil %s", i, this.markup))
require.Equal(t, this.expectedSummary, string(sc.summary), fmt.Sprintf("[%d] Summary markup %s", i, this.markup))
require.Equal(t, this.expectedContent, string(sc.content), fmt.Sprintf("[%d] Content markup %s", i, this.markup))
}
Wordpress summaries Allow full control of summaries which can be rendered as html rather than text. Using a `<!--more-->` html comment in your markdown / rst you can indiciate where the summary should end and have the summary converted to html. Signed-off-by: Noah Campbell <noahcampbell@gmail.com> Conflicts: hugolib/page_test.go
2013-08-21 05:37:14 -04:00
}
func TestPageWithDelimiter(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
checkPageTitle(t, p, "Simple")
checkPageContent(t, p, normalizeExpected(ext, "<p>Summary Next Line</p>\n\n<p>Some more text</p>\n"), ext)
checkPageSummary(t, p, normalizeExpected(ext, "<p>Summary Next Line</p>"), ext)
checkPageType(t, p, "page")
checkTruncation(t, p, true, "page with summary delimiter")
}
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithSummaryDelimiter)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
// Issue #1076
func TestPageWithDelimiterForMarkdownThatCrossesBorder(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
cfg, fs := newTestCfg()
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
writeSource(t, fs, filepath.Join("content", "simple.md"), simplePageWithSummaryDelimiterAndMarkdownThatCrossesBorder)
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
2017-02-04 22:20:06 -05:00
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
require.Len(t, s.RegularPages, 1)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
p := s.RegularPages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
if p.Summary != template.HTML("<p>The <a href=\"http://gohugo.io/\">best static site generator</a>.<sup class=\"footnote-ref\" id=\"fnref:1\"><a rel=\"footnote\" href=\"#fn:1\">1</a></sup>\n</p>") {
t.Fatalf("Got summary:\n%q", p.Summary)
}
if p.Content != template.HTML("<p>The <a href=\"http://gohugo.io/\">best static site generator</a>.<sup class=\"footnote-ref\" id=\"fnref:1\"><a rel=\"footnote\" href=\"#fn:1\">1</a></sup>\n</p>\n<div class=\"footnotes\">\n\n<hr />\n\n<ol>\n<li id=\"fn:1\">Many people say so.\n <a class=\"footnote-return\" href=\"#fnref:1\"><sup>[return]</sup></a></li>\n</ol>\n</div>") {
t.Fatalf("Got content:\n%q", p.Content)
gofmt all go code
2014-01-29 17:50:31 -05:00
}
Restoring former snippet behavior & adding test to ensure future behavior
2013-10-04 12:28:28 -04:00
}
The <!--more--> (summary divider) now works even if it is on the same line as content Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 00:07:22 -04:00
Make sure Date and PublishDate is always set to a value if one is available Fixes #3854
2017-10-13 04:21:28 -04:00
// Issue #3854
func TestPageWithDateFields(t *testing.T) {
assert := require.New(t)
pageWithDate := `---
title: P%d
weight: %d
%s: 2017-10-13
---
Simple Page With Some Date`
hasBothDates := func(p *Page) bool {
return p.Date.Year() == 2017 && p.PublishDate.Year() == 2017
}
datePage := func(field string, weight int) string {
return fmt.Sprintf(pageWithDate, weight, weight, field)
}
t.Parallel()
assertFunc := func(t *testing.T, ext string, pages Pages) {
assert.True(len(pages) > 0)
for _, p := range pages {
assert.True(hasBothDates(p))
}
}
fields := []string{"date", "publishdate", "pubdate", "published"}
pageContents := make([]string, len(fields))
for i, field := range fields {
pageContents[i] = datePage(field, i+1)
}
testAllMarkdownEnginesForPages(t, assertFunc, nil, pageContents...)
}
hugolib: Make RawContent raw again This was a regression introduced in Hugo 0.17. Fixes #2601
2016-12-01 04:21:49 -05:00
// Issue #2601
func TestPageRawContent(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
cfg, fs := newTestCfg()
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
writeSource(t, fs, filepath.Join("content", "raw.md"), `---
hugolib: Make RawContent raw again This was a regression introduced in Hugo 0.17. Fixes #2601
2016-12-01 04:21:49 -05:00
title: Raw
---
**Raw**`)
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
writeSource(t, fs, filepath.Join("layouts", "_default", "single.html"), `{{ .RawContent }}`)
hugolib: Make RawContent raw again This was a regression introduced in Hugo 0.17. Fixes #2601
2016-12-01 04:21:49 -05:00
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
2017-02-04 22:20:06 -05:00
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
hugolib: Make RawContent raw again This was a regression introduced in Hugo 0.17. Fixes #2601
2016-12-01 04:21:49 -05:00
require.Len(t, s.RegularPages, 1)
p := s.RegularPages[0]
require.Contains(t, p.RawContent(), "**Raw**")
}
Restoring former snippet behavior & adding test to ensure future behavior
2013-10-04 12:28:28 -04:00
func TestPageWithShortCodeInSummary(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
checkPageTitle(t, p, "Simple")
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
checkPageContent(t, p, normalizeExpected(ext, "<p>Summary Next Line. \n<figure >\n \n <img src=\"/not/real\" />\n \n \n</figure>\n.\nMore text here.</p>\n\n<p>Some more text</p>\n"))
checkPageSummary(t, p, "Summary Next Line. . More text here. Some more text")
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
checkPageType(t, p, "page")
gofmt all go code
2014-01-29 17:50:31 -05:00
}
Shortcode rewrite, take 2 This commit contains a restructuring and partial rewrite of the shortcode handling. Prior to this commit rendering of the page content was mingled with handling of the shortcodes. This led to several oddities. The new flow is: 1. Shortcodes are extracted from page and replaced with placeholders. 2. Shortcodes are processed and rendered 3. Page is processed 4. The placeholders are replaced with the rendered shortcodes The handling of summaries is also made simpler by this. This commit also introduces some other chenges: 1. distinction between shortcodes that need further processing and those who do not: * `{{< >}}`: Typically raw HTML. Will not be processed. * `{{% %}}`: Will be processed by the page's markup engine (Markdown or (infuture) Asciidoctor) The above also involves a new shortcode-parser, with lexical scanning inspired by Rob Pike's talk called "Lexical Scanning in Go", which should be easier to understand, give better error messages and perform better. 2. If you want to exclude a shortcode from being processed (for documentation etc.), the inner part of the shorcode must be commented out, i.e. `{{%/* movie 47238zzb */%}}`. See the updated shortcode section in the documentation for further examples. The new parser supports nested shortcodes. This isn't new, but has two related design choices worth mentioning: * The shortcodes will be rendered individually, so If both `{{< >}}` and `{{% %}}` are used in the nested hierarchy, one will be passed through the page's markdown processor, the other not. * To avoid potential costly overhead of always looking far ahead for a possible closing tag, this implementation looks at the template itself, and is branded as a container with inner content if it contains a reference to `.Inner` Fixes #565 Fixes #480 Fixes #461 And probably some others.
2014-10-27 16:48:30 -04:00
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithShortcodeInSummary)
The <!--more--> (summary divider) now works even if it is on the same line as content Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 00:07:22 -04:00
}
Support embedding <script> tags in markdown pages
2014-05-29 23:42:12 -04:00
func TestPageWithEmbeddedScriptTag(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
if ext == "ad" || ext == "rst" {
// TOD(bep)
return
}
checkPageContent(t, p, "<script type='text/javascript'>alert('the script tags are still there, right?');</script>\n", ext)
Support embedding <script> tags in markdown pages
2014-05-29 23:42:12 -04:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithEmbeddedScript)
Support embedding <script> tags in markdown pages
2014-05-29 23:42:12 -04:00
}
Add site-wide/per-page [blackfriday] `extensions` option
2015-01-25 06:08:02 -05:00
func TestPageWithAdditionalExtension(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
cfg, fs := newTestCfg()
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
writeSource(t, fs, filepath.Join("content", "simple.md"), simplePageWithAdditionalExtension)
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
2017-02-04 22:20:06 -05:00
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
require.Len(t, s.RegularPages, 1)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
p := s.RegularPages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Add site-wide/per-page [blackfriday] `extensions` option
2015-01-25 06:08:02 -05:00
checkPageContent(t, p, "<p>first line.<br />\nsecond line.</p>\n\n<p>fourth line.</p>\n")
}
Moved TOC test into page_test. Some general page_test cleanup.
2014-01-28 23:09:24 -05:00
func TestTableOfContents(t *testing.T) {
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
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
2017-02-04 22:20:06 -05:00
cfg, fs := newTestCfg()
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
writeSource(t, fs, filepath.Join("content", "tocpage.md"), pageWithToC)
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
2017-02-04 22:20:06 -05:00
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
require.Len(t, s.RegularPages, 1)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
p := s.RegularPages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Fix broken tests
2016-04-12 13:18:02 -04:00
checkPageContent(t, p, "\n\n<p>For some moments the old man did not reply. He stood with bowed head, buried in deep thought. But at last he spoke.</p>\n\n<h2 id=\"aa\">AA</h2>\n\n<p>I have no idea, of course, how long it took me to reach the limit of the plain,\nbut at last I entered the foothills, following a pretty little canyon upward\ntoward the mountains. Beside me frolicked a laughing brooklet, hurrying upon\nits noisy way down to the silent sea. In its quieter pools I discovered many\nsmall fish, of four-or five-pound weight I should imagine. In appearance,\nexcept as to size and color, they were not unlike the whale of our own seas. As\nI watched them playing about I discovered, not only that they suckled their\nyoung, but that at intervals they rose to the surface to breathe as well as to\nfeed upon certain grasses and a strange, scarlet lichen which grew upon the\nrocks just above the water line.</p>\n\n<h3 id=\"aaa\">AAA</h3>\n\n<p>I remember I felt an extraordinary persuasion that I was being played with,\nthat presently, when I was upon the very verge of safety, this mysterious\ndeath&ndash;as swift as the passage of light&ndash;would leap after me from the pit about\nthe cylinder and strike me down. ## BB</p>\n\n<h3 id=\"bbb\">BBB</h3>\n\n<p>&ldquo;You&rsquo;re a great Granser,&rdquo; he cried delightedly, &ldquo;always making believe them little marks mean something.&rdquo;</p>\n")
checkPageTOC(t, p, "<nav id=\"TableOfContents\">\n<ul>\n<li>\n<ul>\n<li><a href=\"#aa\">AA</a>\n<ul>\n<li><a href=\"#aaa\">AAA</a></li>\n<li><a href=\"#bbb\">BBB</a></li>\n</ul></li>\n</ul></li>\n</ul>\n</nav>")
Moved TOC test into page_test. Some general page_test cleanup.
2014-01-28 23:09:24 -05:00
}
The <!--more--> (summary divider) now works even if it is on the same line as content Signed-off-by: Noah Campbell <noahcampbell@gmail.com>
2013-09-01 00:07:22 -04:00
func TestPageWithMoreTag(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
checkPageTitle(t, p, "Simple")
checkPageContent(t, p, normalizeExpected(ext, "<p>Summary Same Line</p>\n\n<p>Some more text</p>\n"))
checkPageSummary(t, p, normalizeExpected(ext, "<p>Summary Same Line</p>"))
checkPageType(t, p, "page")
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
gofmt all go code
2014-01-29 17:50:31 -05:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithSummaryDelimiterSameLine)
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
hugolib: Fix regression of .Truncated evaluation in manual summaries This fixes the behavior of .Truncated that was introduced with commit bef496b97e1dc2df8c52b080152d539a58752801 which was later broken. The desired behavior is that .Truncated would evaluate to false when there was nothing after the user defined summary marker. This also adds a simple unit test to ensure that this feature isn't broken again. The check for content after the user defined summary marker is done on the raw content instead of the working copy because some of the markup renderers add elements after the marker, making it difficult to determine if there is actually any content. The behavior (evaluating to false when there is no content, just summary) is also now documented.
2017-01-26 14:58:25 -05:00
func TestPageWithMoreTagOnlySummary(t *testing.T) {
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
checkTruncation(t, p, false, "page with summary delimiter at end")
}
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithSummaryDelimiterOnlySummary)
}
hugolib: Add more summary test Closes #2973
2017-06-28 14:30:26 -04:00
// #2973
func TestSummaryWithHTMLTagsOnNextLine(t *testing.T) {
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
require.Contains(t, p.Summary, "Happy new year everyone!")
require.NotContains(t, p.Summary, "User interface")
}
testAllMarkdownEnginesForPages(t, assertFunc, nil, `---
title: Simple
---
Happy new year everyone!
Here is the last report for commits in the year 2016. It covers hrev50718-hrev50829.
<!--more-->
<h3>User interface</h3>
`)
}
Date rendering unit tests in pages Tests to ensure rendering dates in templates is working correctly. Actually, I was running into invalid templates not giving warnings when I was trying to render a date.
2013-09-03 17:51:06 -04:00
func TestPageWithDate(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
cfg, fs := newTestCfg()
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
writeSource(t, fs, filepath.Join("content", "simple.md"), simplePageRFC3339Date)
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
2017-02-04 22:20:06 -05:00
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
require.Len(t, s.RegularPages, 1)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
p := s.RegularPages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
d, _ := time.Parse(time.RFC3339, "2013-05-17T16:59:30Z")
gofmt all go code
2014-01-29 17:50:31 -05:00
checkPageDate(t, p, d)
Date rendering unit tests in pages Tests to ensure rendering dates in templates is working correctly. Actually, I was running into invalid templates not giving warnings when I was trying to render a date.
2013-09-03 17:51:06 -04:00
}
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
func TestWordCountWithAllCJKRunesWithoutHasCJKLanguage(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
if p.WordCount() != 8 {
t.Fatalf("[%s] incorrect word count for content '%s'. expected %v, got %v", ext, p.plain, 8, p.WordCount())
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
}
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithAllCJKRunes)
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
}
func TestWordCountWithAllCJKRunesHasCJKLanguage(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
settings := map[string]interface{}{"hasCJKLanguage": true}
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
if p.WordCount() != 15 {
t.Fatalf("[%s] incorrect word count for content '%s'. expected %v, got %v", ext, p.plain, 15, p.WordCount())
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
}
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages(t, assertFunc, settings, simplePageWithAllCJKRunes)
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
}
func TestWordCountWithMainEnglishWithCJKRunes(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
settings := map[string]interface{}{"hasCJKLanguage": true}
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
if p.WordCount() != 74 {
t.Fatalf("[%s] incorrect word count for content '%s'. expected %v, got %v", ext, p.plain, 74, p.WordCount())
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
Add RuneCount to Page Fixes #1266
2015-07-12 05:05:37 -04:00
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
if p.Summary != simplePageWithMainEnglishWithCJKRunesSummary {
t.Fatalf("[%s] incorrect Summary for content '%s'. expected %v, got %v", ext, p.plain,
simplePageWithMainEnglishWithCJKRunesSummary, p.Summary)
}
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages(t, assertFunc, settings, simplePageWithMainEnglishWithCJKRunes)
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
}
func TestWordCountWithIsCJKLanguageFalse(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
settings := map[string]interface{}{
"hasCJKLanguage": true,
}
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
if p.WordCount() != 75 {
t.Fatalf("[%s] incorrect word count for content '%s'. expected %v, got %v", ext, p.plain, 74, p.WordCount())
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
WordCount and Summary support CJK Language * add global `hasCJKLanguage` flag, if true, turn on auto-detecting CJKLanguage * add `isCJKLanguage` frontmatter to force specify whether is CJKLanguage or not * For .Summary: If isCJKLanguage is true, use the runes as basis for truncation, else keep as today. * For WordCount: If isCJKLanguage is true, use the runes as basis for calculation, else keep as today. * Unexport RuneCount Fixes #1377
2015-09-03 06:22:20 -04:00
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
if p.Summary != simplePageWithIsCJKLanguageFalseSummary {
t.Fatalf("[%s] incorrect Summary for content '%s'. expected %v, got %v", ext, p.plain,
simplePageWithIsCJKLanguageFalseSummary, p.Summary)
}
Add RuneCount to Page Fixes #1266
2015-07-12 05:05:37 -04:00
}
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
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
2017-02-04 22:20:06 -05:00
testAllMarkdownEnginesForPages(t, assertFunc, settings, simplePageWithIsCJKLanguageFalse)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Add RuneCount to Page Fixes #1266
2015-07-12 05:05:37 -04:00
}
Wordcount restored. fixed #92
2013-10-15 09:15:52 -04:00
func TestWordCount(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Fix a more summary corner case Also refactor the rendering pages test to accept more than one page source per test run, which wasn't really needed for this issue, but may be in the future. Closes #2586 Fixes #2538
2016-10-18 02:43:44 -04:00
assertFunc := func(t *testing.T, ext string, pages Pages) {
p := pages[0]
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
if p.WordCount() != 483 {
t.Fatalf("[%s] incorrect word count. expected %v, got %v", ext, 483, p.WordCount())
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
gofmt all go code
2014-01-29 17:50:31 -05:00
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
if p.FuzzyWordCount() != 500 {
t.Fatalf("[%s] incorrect word count. expected %v, got %v", ext, 500, p.WordCount())
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
Lazy calculate WordCount, ReadingTime and FuzzyWordCount This avoids having to execute these expensive operations for sites not using these values. This commit sums up a set of wordcounting and autosummary related performance improvements. The effect of these kind of depends on what features your site use, but a benchmark from 4 Hugo sites in the wild shows promise: ``` benchmark old ns/op new ns/op delta BenchmarkHugo-4 21293005843 20032857342 -5.92% benchmark old allocs new allocs delta BenchmarkHugo-4 65290922 65186032 -0.16% benchmark old bytes new bytes delta BenchmarkHugo-4 9771213416 9681866464 -0.91% ``` Closes #2378
2016-08-17 07:41:48 -04:00
if p.ReadingTime() != 3 {
t.Fatalf("[%s] incorrect min read. expected %v, got %v", ext, 3, p.ReadingTime())
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
}
gofmt all go code
2014-01-29 17:50:31 -05:00
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
checkTruncation(t, p, true, "long page")
gofmt all go code
2014-01-29 17:50:31 -05:00
}
Refactor Page tests * To handle config in one place * To use the real builder chain
2016-10-28 03:34:47 -04:00
testAllMarkdownEnginesForPages(t, assertFunc, nil, simplePageWithLongContent)
Wordcount restored. fixed #92
2013-10-15 09:15:52 -04:00
}
Adding more test cases
2013-08-07 02:04:49 -04:00
func TestCreatePage(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
gofmt all go code
2014-01-29 17:50:31 -05:00
var tests = []struct {
r string
}{
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
{simplePageJSON},
{simplePageJSONMultiple},
gofmt all go code
2014-01-29 17:50:31 -05:00
//{strings.NewReader(SIMPLE_PAGE_JSON_COMPACT)},
}
parser: Fix handling of quoted brackets in JSON front matter Also remove a broken JSON test. Fixes #3511
2017-06-19 10:45:52 -04:00
for i, test := range tests {
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
2017-02-04 22:20:06 -05:00
s := newTestSite(t)
p, _ := s.NewPage("page")
hugolib: make Page implement the ReaderFrom interface
2015-04-03 15:41:12 -04:00
if _, err := p.ReadFrom(strings.NewReader(test.r)); err != nil {
parser: Fix handling of quoted brackets in JSON front matter Also remove a broken JSON test. Fixes #3511
2017-06-19 10:45:52 -04:00
t.Fatalf("[%d] Unable to parse page: %s", i, err)
gofmt all go code
2014-01-29 17:50:31 -05:00
}
}
Adding more test cases
2013-08-07 02:04:49 -04:00
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
func TestDegenerateInvalidFrontMatterShortDelim(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
gofmt all go code
2014-01-29 17:50:31 -05:00
var tests = []struct {
r string
err string
}{
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
{invalidFrontmatterShortDelimEnding, "unable to read frontmatter at filepos 45: EOF"},
gofmt all go code
2014-01-29 17:50:31 -05:00
}
for _, test := range tests {
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
2017-02-04 22:20:06 -05:00
s := newTestSite(t)
p, _ := s.NewPage("invalid/front/matter/short/delim")
hugolib: make Page implement the ReaderFrom interface
2015-04-03 15:41:12 -04:00
_, err := p.ReadFrom(strings.NewReader(test.r))
gofmt all go code
2014-01-29 17:50:31 -05:00
checkError(t, err, test.err)
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
Add IsRenderable to Page As pages are read from the target, they will be assessed if they should be rendered or not. The logic for IsRenderable is in the parser/page.go and looks for anything exception '<'.
2013-09-18 13:17:43 -04:00
func TestShouldRenderContent(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
gofmt all go code
2014-01-29 17:50:31 -05:00
var tests = []struct {
text string
render bool
}{
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
{invalidFrontMatterMissing, true},
gofmt all go code
2014-01-29 17:50:31 -05:00
// TODO how to deal with malformed frontmatter. In this case it'll be rendered as markdown.
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
{invalidFrontmatterShortDelim, true},
{renderNoFrontmatter, false},
{contentWithCommentedFrontmatter, true},
{contentWithCommentedTextFrontmatter, true},
{contentWithCommentedLongFrontmatter, false},
{contentWithCommentedLong2Frontmatter, true},
gofmt all go code
2014-01-29 17:50:31 -05:00
}
for _, test := range tests {
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
2017-02-04 22:20:06 -05:00
s := newTestSite(t)
p, _ := s.NewPage("render/front/matter")
hugolib: make Page implement the ReaderFrom interface
2015-04-03 15:41:12 -04:00
_, err := p.ReadFrom(strings.NewReader(test.text))
permitting empty files again. Fixing some tests to now pass.
2014-05-01 14:11:56 -04:00
p = pageMust(p, err)
gofmt all go code
2014-01-29 17:50:31 -05:00
if p.IsRenderable() != test.render {
t.Errorf("expected p.IsRenderable() == %t, got %t", test.render, p.IsRenderable())
}
}
Add IsRenderable to Page As pages are read from the target, they will be assessed if they should be rendered or not. The logic for IsRenderable is in the parser/page.go and looks for anything exception '<'.
2013-09-18 13:17:43 -04:00
}
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
// Issue #768
func TestCalendarParamsVariants(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
pageJSON, _ := s.NewPage("test/fileJSON.md")
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
_, _ = pageJSON.ReadFrom(strings.NewReader(pageWithCalendarJSONFrontmatter))
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
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
2017-02-04 22:20:06 -05:00
pageYAML, _ := s.NewPage("test/fileYAML.md")
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
_, _ = pageYAML.ReadFrom(strings.NewReader(pageWithCalendarYAMLFrontmatter))
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
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
2017-02-04 22:20:06 -05:00
pageTOML, _ := s.NewPage("test/fileTOML.md")
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
_, _ = pageTOML.ReadFrom(strings.NewReader(pageWithCalendarTOMLFrontmatter))
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
assert.True(t, compareObjects(pageJSON.Params, pageYAML.Params))
assert.True(t, compareObjects(pageJSON.Params, pageTOML.Params))
}
Adding support for more front matter types (int, float & date)
2013-10-24 17:31:04 -04:00
func TestDifferentFrontMatterVarTypes(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
page, _ := s.NewPage("test/file1.md")
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
_, _ = page.ReadFrom(strings.NewReader(pageWithVariousFrontmatterTypes))
gofmt all go code
2014-01-29 17:50:31 -05:00
dateval, _ := time.Parse(time.RFC3339, "1979-05-27T07:32:00Z")
hugolib: Do not tolower result from Page.GetParam We still do lowering of the param strings in some internal use of this, but the exported `GetParam` method is changed to a more sensible default. This was used for the `disqus_title` etc. in the internal Disqus template, which was obviously not right. If you really want to lowercase your params, do it with `.GetParam "myparam" | lower` or similar. Fixes #4187
2017-12-29 02:58:38 -05:00
if page.getParamToLower("a_string") != "bar" {
t.Errorf("frontmatter not handling strings correctly should be %s, got: %s", "bar", page.getParamToLower("a_string"))
gofmt all go code
2014-01-29 17:50:31 -05:00
}
hugolib: Do not tolower result from Page.GetParam We still do lowering of the param strings in some internal use of this, but the exported `GetParam` method is changed to a more sensible default. This was used for the `disqus_title` etc. in the internal Disqus template, which was obviously not right. If you really want to lowercase your params, do it with `.GetParam "myparam" | lower` or similar. Fixes #4187
2017-12-29 02:58:38 -05:00
if page.getParamToLower("an_integer") != 1 {
t.Errorf("frontmatter not handling ints correctly should be %s, got: %s", "1", page.getParamToLower("an_integer"))
gofmt all go code
2014-01-29 17:50:31 -05:00
}
hugolib: Do not tolower result from Page.GetParam We still do lowering of the param strings in some internal use of this, but the exported `GetParam` method is changed to a more sensible default. This was used for the `disqus_title` etc. in the internal Disqus template, which was obviously not right. If you really want to lowercase your params, do it with `.GetParam "myparam" | lower` or similar. Fixes #4187
2017-12-29 02:58:38 -05:00
if page.getParamToLower("a_float") != 1.3 {
t.Errorf("frontmatter not handling floats correctly should be %f, got: %s", 1.3, page.getParamToLower("a_float"))
gofmt all go code
2014-01-29 17:50:31 -05:00
}
hugolib: Do not tolower result from Page.GetParam We still do lowering of the param strings in some internal use of this, but the exported `GetParam` method is changed to a more sensible default. This was used for the `disqus_title` etc. in the internal Disqus template, which was obviously not right. If you really want to lowercase your params, do it with `.GetParam "myparam" | lower` or similar. Fixes #4187
2017-12-29 02:58:38 -05:00
if page.getParamToLower("a_bool") != false {
t.Errorf("frontmatter not handling bools correctly should be %t, got: %s", false, page.getParamToLower("a_bool"))
gofmt all go code
2014-01-29 17:50:31 -05:00
}
hugolib: Do not tolower result from Page.GetParam We still do lowering of the param strings in some internal use of this, but the exported `GetParam` method is changed to a more sensible default. This was used for the `disqus_title` etc. in the internal Disqus template, which was obviously not right. If you really want to lowercase your params, do it with `.GetParam "myparam" | lower` or similar. Fixes #4187
2017-12-29 02:58:38 -05:00
if page.getParamToLower("a_date") != dateval {
t.Errorf("frontmatter not handling dates correctly should be %s, got: %s", dateval, page.getParamToLower("a_date"))
gofmt all go code
2014-01-29 17:50:31 -05:00
}
hugolib: Do not tolower result from Page.GetParam We still do lowering of the param strings in some internal use of this, but the exported `GetParam` method is changed to a more sensible default. This was used for the `disqus_title` etc. in the internal Disqus template, which was obviously not right. If you really want to lowercase your params, do it with `.GetParam "myparam" | lower` or similar. Fixes #4187
2017-12-29 02:58:38 -05:00
param := page.getParamToLower("a_table")
Fix for page.GetParam() for JSON and TOML maps Setting per-page Blackfriday angledQuotes did not work with TOML or JSON front matter, but it does work with YAML. It turns out that page.Params("blackfriday") returns type map[interface{}]interface{} for YAML, but type map[string]interface{} for JSON and TOML. This patch updates page.GetParam() to catch the latter, with an error message if page.GetParam() does not recognize a type. A test is also added.
2015-01-24 06:44:35 -05:00
if param == nil {
t.Errorf("frontmatter not handling tables correctly should be type of %v, got: type of %v", reflect.TypeOf(page.Params["a_table"]), reflect.TypeOf(param))
}
if cast.ToStringMap(param)["a_key"] != "a_value" {
t.Errorf("frontmatter not handling values inside a table correctly should be %s, got: %s", "a_value", cast.ToStringMap(page.Params["a_table"])["a_key"])
}
Adding support for more front matter types (int, float & date)
2013-10-24 17:31:04 -04:00
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
func TestDegenerateInvalidFrontMatterLeadingWhitespace(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
p, _ := s.NewPage("invalid/front/matter/leading/ws")
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
_, err := p.ReadFrom(strings.NewReader(invalidFrontmatterLadingWs))
gofmt all go code
2014-01-29 17:50:31 -05:00
if err != nil {
t.Fatalf("Unable to parse front matter given leading whitespace: %s", err)
}
Adding ability to read from io.Reader This allows for testing without relying on the file system. Parsing algorithm to not read the entire file into memory.
2013-08-05 10:53:58 -04:00
}
Removing GetSection Using GetXXX is not idiomatic to Go. Also added a bunch of unit testing around this method.
2013-08-14 18:22:57 -04:00
Ensure Section is set before returning Page object.
2013-08-30 20:14:36 -04:00
func TestSectionEvaluation(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
page, _ := s.NewPage(filepath.FromSlash("blue/file1.md"))
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
page.ReadFrom(strings.NewReader(simplePage))
Big refactor of how source files are used. Also added default destination extension option.
2014-10-16 20:20:09 -04:00
if page.Section() != "blue" {
Fix various Windows-issues File handling was broken on Windows. This commit contains a revision of the path handling with separation of file paths and urls where needed. There may be remaining issues and there may be better ways to do this, but it is easier to start that refactoring job with a set of passing tests. Fixes #687 Fixes #660
2014-12-07 13:48:00 -05:00
t.Errorf("Section should be %s, got: %s", "blue", page.Section())
gofmt all go code
2014-01-29 17:50:31 -05:00
}
Ensure Section is set before returning Page object.
2013-08-30 20:14:36 -04:00
}
fix tags not being in lowercase, #491
2014-09-09 16:58:02 -04:00
func TestSliceToLower(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
#462 fix, remove leading and trailing dashes from urlized slug. includes test changes
2014-10-02 18:25:52 -04:00
tests := []struct {
value []string
fix tags not being in lowercase, #491
2014-09-09 16:58:02 -04:00
expected []string
}{
#462 fix, remove leading and trailing dashes from urlized slug. includes test changes
2014-10-02 18:25:52 -04:00
{[]string{"a", "b", "c"}, []string{"a", "b", "c"}},
{[]string{"a", "B", "c"}, []string{"a", "b", "c"}},
{[]string{"A", "B", "C"}, []string{"a", "b", "c"}},
fix tags not being in lowercase, #491
2014-09-09 16:58:02 -04:00
}
for _, test := range tests {
Big refactor of how source files are used. Also added default destination extension option.
2014-10-16 20:20:09 -04:00
res := helpers.SliceToLower(test.value)
fix tags not being in lowercase, #491
2014-09-09 16:58:02 -04:00
for i, val := range res {
if val != test.expected[i] {
t.Errorf("Case mismatch. Expected %s, got %s", test.expected[i], res[i])
}
}
}
}
hugolib: Extract replaceDivider logic To its own function and add a test and a benchmark for it.
2017-08-14 02:42:30 -04:00
func TestReplaceDivider(t *testing.T) {
t.Parallel()
tests := []struct {
content string
from string
to string
expectedContent string
expectedTruncated bool
}{
{"none", "a", "b", "none", false},
hugolib: Rewrite replaceDivider to reduce memory allocation ```bash name old time/op new time/op delta ReplaceDivider-4 9.76µs ±105% 7.96µs ±24% ~ (p=0.690 n=5+5) name old alloc/op new alloc/op delta ReplaceDivider-4 3.46kB ± 0% 1.54kB ± 0% -55.56% (p=0.008 n=5+5) name old allocs/op new allocs/op delta ReplaceDivider-4 6.00 ± 0% 1.00 ± 0% -83.33% (p=0.008 n=5+5) ```
2017-08-14 03:24:38 -04:00
{"summary <!--more--> content", "<!--more-->", "HUGO", "summary HUGO content", true},
hugolib: Extract replaceDivider logic To its own function and add a test and a benchmark for it.
2017-08-14 02:42:30 -04:00
{"summary\n\ndivider", "divider", "HUGO", "summary\n\nHUGO", false},
{"summary\n\ndivider\n\r", "divider", "HUGO", "summary\n\nHUGO\n\r", false},
}
for i, test := range tests {
replaced, truncated := replaceDivider([]byte(test.content), []byte(test.from), []byte(test.to))
if truncated != test.expectedTruncated {
t.Fatalf("[%d] Expected truncated to be %t, was %t", i, test.expectedTruncated, truncated)
}
if string(replaced) != test.expectedContent {
t.Fatalf("[%d] Expected content to be %q, was %q", i, test.expectedContent, replaced)
}
}
}
func BenchmarkReplaceDivider(b *testing.B) {
divider := "HUGO_DIVIDER"
from, to := []byte(divider), []byte("HUGO_REPLACED")
withDivider := make([][]byte, b.N)
noDivider := make([][]byte, b.N)
for i := 0; i < b.N; i++ {
withDivider[i] = []byte(strings.Repeat("Summary ", 5) + "\n" + divider + "\n" + strings.Repeat("Word ", 300))
noDivider[i] = []byte(strings.Repeat("Word ", 300))
}
b.ResetTimer()
for i := 0; i < b.N; i++ {
_, t1 := replaceDivider(withDivider[i], from, to)
_, t2 := replaceDivider(noDivider[i], from, to)
if !t1 {
b.Fatal("Should be truncated")
}
if t2 {
b.Fatal("Should not be truncated")
}
}
}
Fix FullFilePath Fixes #732
2015-05-31 12:54:50 -04:00
func TestPagePaths(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Stop Viper from leaking across many of the tests (now tests pass regardless of order tested)
2015-05-20 02:21:21 -04:00
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
2017-02-04 22:20:06 -05:00
siteParmalinksSetting := map[string]string{
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
"post": ":year/:month/:day/:title/",
}
tests := []struct {
Stop Viper from leaking across many of the tests (now tests pass regardless of order tested)
2015-05-20 02:21:21 -04:00
content string
path string
hasPermalink bool
expected string
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
}{
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
2017-02-04 22:20:06 -05:00
{simplePage, "post/x.md", false, "post/x.html"},
{simplePageWithURL, "post/x.md", false, "simple/url/index.html"},
{simplePageWithSlug, "post/x.md", false, "post/simple-slug.html"},
{simplePageWithDate, "post/x.md", true, "2013/10/15/simple/index.html"},
{UTF8Page, "post/x.md", false, "post/x.html"},
{UTF8PageWithURL, "post/x.md", false, "ラーメン/url/index.html"},
{UTF8PageWithSlug, "post/x.md", false, "post/ラーメン-slug.html"},
{UTF8PageWithDate, "post/x.md", true, "2013/10/15/ラーメン/index.html"},
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
}
Implement the first generic JSON output testcase
2017-03-08 07:45:33 -05:00
for _, test := range tests {
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
2017-02-04 22:20:06 -05:00
cfg, fs := newTestCfg()
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
if test.hasPermalink {
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
2017-02-04 22:20:06 -05:00
cfg.Set("permalinks", siteParmalinksSetting)
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
}
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
2017-02-04 22:20:06 -05:00
writeSource(t, fs, filepath.Join("content", filepath.FromSlash(test.path)), test.content)
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
require.Len(t, s.RegularPages, 1)
Add Page tests with UTF8 paths See #988
2015-05-09 06:12:30 -04:00
}
}
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
var pageWithDraftAndPublished = `---
Add undocumented published setting to front matter A new "published" setting that is the opposite of "draft" is added and left intentionally undocumented. This setting comes from jekyll and eases the transition to hugo greatly. We leave it undocumented so that folks don't rely on it, but also don't shoot themselves in the foot during a jekyll migration. The foot-shooting occurs if they have only a few documents that were drafts ("published: false") in the jekyll version of their site and don't notice that they were published in the migration to hugo.
2015-08-02 02:02:20 -04:00
title: broken
published: false
draft: true
---
some content
`
func TestDraftAndPublishedFrontMatterError(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
_, err := s.NewPageFrom(strings.NewReader(pageWithDraftAndPublished), "content/post/broken.md")
Add undocumented published setting to front matter A new "published" setting that is the opposite of "draft" is added and left intentionally undocumented. This setting comes from jekyll and eases the transition to hugo greatly. We leave it undocumented so that folks don't rely on it, but also don't shoot themselves in the foot during a jekyll migration. The foot-shooting occurs if they have only a few documents that were drafts ("published: false") in the jekyll version of their site and don't notice that they were published in the migration to hugo.
2015-08-02 02:02:20 -04:00
if err != ErrHasDraftAndPublished {
t.Errorf("expected ErrHasDraftAndPublished, was %#v", err)
}
}
Add draft test See #2549
2016-10-11 12:12:28 -04:00
var pagesWithPublishedFalse = `---
Correct check of published boolean
2015-08-30 18:51:25 -04:00
title: okay
published: false
---
some content
`
hugolib: Even more Golint fixes
2016-03-24 09:42:03 -04:00
var pageWithPublishedTrue = `---
Correct check of published boolean
2015-08-30 18:51:25 -04:00
title: okay
published: true
---
some content
`
func TestPublishedFrontMatter(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
p, err := s.NewPageFrom(strings.NewReader(pagesWithPublishedFalse), "content/post/broken.md")
Correct check of published boolean
2015-08-30 18:51:25 -04:00
if err != nil {
t.Fatalf("err during parse: %s", err)
}
if !p.Draft {
t.Errorf("expected true, got %t", p.Draft)
}
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
2017-02-04 22:20:06 -05:00
p, err = s.NewPageFrom(strings.NewReader(pageWithPublishedTrue), "content/post/broken.md")
Correct check of published boolean
2015-08-30 18:51:25 -04:00
if err != nil {
t.Fatalf("err during parse: %s", err)
}
if p.Draft {
t.Errorf("expected false, got %t", p.Draft)
}
}
Add draft test See #2549
2016-10-11 12:12:28 -04:00
var pagesDraftTemplate = []string{`---
title: "okay"
draft: %t
---
some content
`,
`+++
title = "okay"
draft = %t
+++
some content
`,
}
func TestDraft(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
Add draft test See #2549
2016-10-11 12:12:28 -04:00
for _, draft := range []bool{true, false} {
for i, templ := range pagesDraftTemplate {
pageContent := fmt.Sprintf(templ, draft)
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
2017-02-04 22:20:06 -05:00
p, err := s.NewPageFrom(strings.NewReader(pageContent), "content/post/broken.md")
Add draft test See #2549
2016-10-11 12:12:28 -04:00
if err != nil {
t.Fatalf("err during parse: %s", err)
}
if p.Draft != draft {
t.Errorf("[%d] expected %t, got %t", i, draft, p.Draft)
}
}
}
}
hugolib: Allow arrays of arrays in frontmatter Params Fixes #2752
2016-12-27 21:08:24 -05:00
var pagesParamsTemplate = []string{`+++
title = "okay"
draft = false
tags = [ "hugo", "web" ]
social= [
[ "a", "#" ],
[ "b", "#" ],
]
+++
some content
`,
`---
title: "okay"
draft: false
tags:
- hugo
- web
social:
- - a
- "#"
- - b
- "#"
---
some content
`,
`{
"title": "okay",
"draft": false,
"tags": [ "hugo", "web" ],
"social": [
[ "a", "#" ],
[ "b", "#" ]
]
}
some content
`,
}
func TestPageParams(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
hugolib: Enhance `.Param` to permit arbitrarily nested parameter references The Param method currently assumes that its argument is a single, distinct, top-level key to look up in the Params map. This enhances the Param method; it will now also attempt to see if the key can be interpreted as a nested chain of keys to look up in Params. Fixes #2598
2017-02-19 02:50:08 -05:00
wantedMap := map[string]interface{}{
hugolib: Allow arrays of arrays in frontmatter Params Fixes #2752
2016-12-27 21:08:24 -05:00
"tags": []string{"hugo", "web"},
// Issue #2752
"social": []interface{}{
[]interface{}{"a", "#"},
[]interface{}{"b", "#"},
},
}
for i, c := range pagesParamsTemplate {
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
2017-02-04 22:20:06 -05:00
p, err := s.NewPageFrom(strings.NewReader(c), "content/post/params.md")
hugolib: Allow arrays of arrays in frontmatter Params Fixes #2752
2016-12-27 21:08:24 -05:00
require.NoError(t, err, "err during parse", "#%d", i)
all: Fix some govet complaints
2017-03-09 08:18:12 -05:00
for key := range wantedMap {
hugolib: Enhance `.Param` to permit arbitrarily nested parameter references The Param method currently assumes that its argument is a single, distinct, top-level key to look up in the Params map. This enhances the Param method; it will now also attempt to see if the key can be interpreted as a nested chain of keys to look up in Params. Fixes #2598
2017-02-19 02:50:08 -05:00
assert.Equal(t, wantedMap[key], p.Params[key], "#%d", key)
}
hugolib: Allow arrays of arrays in frontmatter Params Fixes #2752
2016-12-27 21:08:24 -05:00
}
}
hugolib: Enhance `.Param` to permit arbitrarily nested parameter references The Param method currently assumes that its argument is a single, distinct, top-level key to look up in the Params map. This enhances the Param method; it will now also attempt to see if the key can be interpreted as a nested chain of keys to look up in Params. Fixes #2598
2017-02-19 02:50:08 -05:00
func TestTraverse(t *testing.T) {
exampleParams := `---
rating: "5 stars"
tags:
- hugo
- web
social:
twitter: "@jxxf"
facebook: "https://example.com"
---`
t.Parallel()
s := newTestSite(t)
p, _ := s.NewPageFrom(strings.NewReader(exampleParams), "content/post/params.md")
topLevelKeyValue, _ := p.Param("rating")
assert.Equal(t, "5 stars", topLevelKeyValue)
nestedStringKeyValue, _ := p.Param("social.twitter")
assert.Equal(t, "@jxxf", nestedStringKeyValue)
nonexistentKeyValue, _ := p.Param("doesn't.exist")
assert.Nil(t, nonexistentKeyValue)
}
Add Page tests for simple methods
2016-02-07 07:32:08 -05:00
func TestPageSimpleMethods(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
s := newTestSite(t)
Add Page tests for simple methods
2016-02-07 07:32:08 -05:00
for i, this := range []struct {
assertFunc func(p *Page) bool
}{
{func(p *Page) bool { return !p.IsNode() }},
{func(p *Page) bool { return p.IsPage() }},
{func(p *Page) bool { return p.Plain() == "Do Be Do Be Do" }},
{func(p *Page) bool { return strings.Join(p.PlainWords(), " ") == "Do Be Do Be Do" }},
} {
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
2017-02-04 22:20:06 -05:00
p, _ := s.NewPage("Test")
Add Page tests for simple methods
2016-02-07 07:32:08 -05:00
p.Content = "<h1>Do Be Do Be Do</h1>"
if !this.assertFunc(p) {
t.Errorf("[%d] Page method error", i)
}
}
}
node to page: Add Pages to Page As an alias to .Data.Pages for home page etc. Also renamte NodeType to PageType and make it a string so it can be used in `where`. Updates #2297
2016-11-11 03:19:16 -05:00
func TestIndexPageSimpleMethods(t *testing.T) {
hugolib: Use the new layout logic in Page
2017-03-06 07:18:33 -05:00
s := newTestSite(t)
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
2017-02-04 22:20:06 -05:00
t.Parallel()
node to page: Add Pages to Page As an alias to .Data.Pages for home page etc. Also renamte NodeType to PageType and make it a string so it can be used in `where`. Updates #2297
2016-11-11 03:19:16 -05:00
for i, this := range []struct {
assertFunc func(n *Page) bool
}{
{func(n *Page) bool { return n.IsNode() }},
{func(n *Page) bool { return !n.IsPage() }},
{func(n *Page) bool { return n.Scratch() != nil }},
{func(n *Page) bool { return n.Hugo() != nil }},
{func(n *Page) bool { return n.Now().Unix() == time.Now().Unix() }},
} {
hugolib: Use the new layout logic in Page
2017-03-06 07:18:33 -05:00
n := s.newHomePage()
Revise the deprecation strategy Git users and theme authors two Hugo releases to fix: 1. With a visible warning 2. Then with an ERROR that exits with -1 Fixes #2726
2016-11-23 11:26:13 -05:00
node to page: Add Pages to Page As an alias to .Data.Pages for home page etc. Also renamte NodeType to PageType and make it a string so it can be used in `where`. Updates #2297
2016-11-11 03:19:16 -05:00
if !this.assertFunc(n) {
t.Errorf("[%d] Node method error", i)
}
}
}
node to page: Make Kind a string Having a custom string type isn't worth it when it doesn't work with `where`, `eq` etc. Fixes #2689 Updates #2297
2016-11-13 06:33:11 -05:00
func TestKind(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
node to page: Add Pages to Page As an alias to .Data.Pages for home page etc. Also renamte NodeType to PageType and make it a string so it can be used in `where`. Updates #2297
2016-11-11 03:19:16 -05:00
// Add tests for these constants to make sure they don't change
node to page: Make Kind a string Having a custom string type isn't worth it when it doesn't work with `where`, `eq` etc. Fixes #2689 Updates #2297
2016-11-13 06:33:11 -05:00
require.Equal(t, "page", KindPage)
require.Equal(t, "home", KindHome)
require.Equal(t, "section", KindSection)
require.Equal(t, "taxonomy", KindTaxonomy)
require.Equal(t, "taxonomyTerm", KindTaxonomyTerm)
node to page: Add Pages to Page As an alias to .Data.Pages for home page etc. Also renamte NodeType to PageType and make it a string so it can be used in `where`. Updates #2297
2016-11-11 03:19:16 -05:00
}
hugolib: Fix .IsTranslated with identical filenames This commit refines the key used to map translations: * Use `translationKey` set in front matter * Fall back to path + base filename (i.e. the filename without extension and language code) Note that the Page Kinde will be prepended to both cases above. It does not make sense to have a section as translation for the home page. Fixes #2699
2017-11-17 10:28:35 -05:00
func TestTranslationKey(t *testing.T) {
t.Parallel()
assert := require.New(t)
cfg, fs := newTestCfg()
writeSource(t, fs, filepath.Join("content", filepath.FromSlash("sect/simple.no.md")), "---\ntitle: \"A1\"\ntranslationKey: \"k1\"\n---\nContent\n")
writeSource(t, fs, filepath.Join("content", filepath.FromSlash("sect/simple.en.md")), "---\ntitle: \"A2\"\n---\nContent\n")
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
require.Len(t, s.RegularPages, 2)
home, _ := s.Info.Home()
assert.NotNil(home)
assert.Equal("home", home.TranslationKey())
assert.Equal("page/k1", s.RegularPages[0].TranslationKey())
p2 := s.RegularPages[1]
:sparkles: Implement Page bundling and image handling This commit is not the smallest in Hugo's history. Some hightlights include: * Page bundles (for complete articles, keeping images and content together etc.). * Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`. * Processed images are cached inside `resources/_gen/images` (default) in your project. * Symbolic links (both files and dirs) are now allowed anywhere inside /content * A new table based build summary * The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below). A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory: ```bash ▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render" benchmark old ns/op new ns/op delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86% benchmark old allocs new allocs delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30% benchmark old bytes new bytes delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64% ``` Fixes #3651 Closes #3158 Fixes #1014 Closes #2021 Fixes #1240 Updates #3757
2017-07-24 03:00:23 -04:00
assert.Equal("page/sect/simple", p2.TranslationKey())
hugolib: Fix .IsTranslated with identical filenames This commit refines the key used to map translations: * Use `translationKey` set in front matter * Fall back to path + base filename (i.e. the filename without extension and language code) Note that the Page Kinde will be prepended to both cases above. It does not make sense to have a section as translation for the home page. Fixes #2699
2017-11-17 10:28:35 -05:00
}
Chomp Unicode BOM if present Useful if using or sharing files with users that use editors that append a unicode byte order marker header (like Windows notepad). This will still assume files are UTF-8 encoded. Closes #2075
2016-04-12 18:14:00 -04:00
func TestChompBOM(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
Chomp Unicode BOM if present Useful if using or sharing files with users that use editors that append a unicode byte order marker header (like Windows notepad). This will still assume files are UTF-8 encoded. Closes #2075
2016-04-12 18:14:00 -04:00
const utf8BOM = "\xef\xbb\xbf"
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
2017-02-04 22:20:06 -05:00
cfg, fs := newTestCfg()
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
all: Refactor to nonglobal file systems Updates #2701 Fixes #2951
2017-01-10 04:55:03 -05:00
writeSource(t, fs, filepath.Join("content", "simple.md"), utf8BOM+simplePage)
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
2017-02-04 22:20:06 -05:00
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{SkipRender: true})
Chomp Unicode BOM if present Useful if using or sharing files with users that use editors that append a unicode byte order marker header (like Windows notepad). This will still assume files are UTF-8 encoded. Closes #2075
2016-04-12 18:14:00 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
require.Len(t, s.RegularPages, 1)
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
node to page: Remove Node And misc. TODO-fixes Updates #2297
2016-11-13 08:27:10 -05:00
p := s.RegularPages[0]
Render the shortcodes as late as possible This is needed to make shortcode users happy with the new multilanguage support, but it will also solve many other related posts about "stuff not available in the shortcode". We will have to revisit this re the handler chain at some point, but that will be easier now as the integration test story has improved so much. As part of this commit, the site-building tests in page_test.go is refreshed, they now tests for all the rendering engines (when available), and all of them now uses the same code-path as used in production. Fixes #1229 Fixes #2323 Fixes ##1076
2016-08-01 17:04:44 -04:00
Chomp Unicode BOM if present Useful if using or sharing files with users that use editors that append a unicode byte order marker header (like Windows notepad). This will still assume files are UTF-8 encoded. Closes #2075
2016-04-12 18:14:00 -04:00
checkPageTitle(t, p, "Simple")
}
Fix inconsistent front matter handling Fixes #768
2015-07-26 09:28:56 -04:00
// TODO(bep) this may be useful for other tests.
func compareObjects(a interface{}, b interface{}) bool {
aStr := strings.Split(fmt.Sprintf("%v", a), "")
sort.Strings(aStr)
bStr := strings.Split(fmt.Sprintf("%v", b), "")
sort.Strings(bStr)
return strings.Join(aStr, "") == strings.Join(bStr, "")
}
hugolib: Refactor page.ShouldBuild and table driven test
2016-05-11 11:45:09 -04:00
Unexport ShouldBuild and AssertShouldBuild
2016-06-14 09:53:49 -04:00
func TestShouldBuild(t *testing.T) {
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
2017-02-04 22:20:06 -05:00
t.Parallel()
hugolib: Refactor page.ShouldBuild and table driven test
2016-05-11 11:45:09 -04:00
var past = time.Date(2009, 11, 17, 20, 34, 58, 651387237, time.UTC)
var future = time.Date(2037, 11, 17, 20, 34, 58, 651387237, time.UTC)
var zero = time.Time{}
var publishSettings = []struct {
buildFuture bool
buildExpired bool
buildDrafts bool
draft bool
publishDate time.Time
expiryDate time.Time
out bool
}{
// publishDate and expiryDate
{false, false, false, false, zero, zero, true},
{false, false, false, false, zero, future, true},
{false, false, false, false, past, zero, true},
{false, false, false, false, past, future, true},
{false, false, false, false, past, past, false},
{false, false, false, false, future, future, false},
{false, false, false, false, future, past, false},
// buildFuture and buildExpired
{false, true, false, false, past, past, true},
{true, true, false, false, past, past, true},
{true, false, false, false, past, past, false},
{true, false, false, false, future, future, true},
{true, true, false, false, future, future, true},
{false, true, false, false, future, past, false},
// buildDrafts and draft
{true, true, false, true, past, future, false},
{true, true, true, true, past, future, true},
{true, true, true, true, past, future, true},
}
for _, ps := range publishSettings {
Unexport ShouldBuild and AssertShouldBuild
2016-06-14 09:53:49 -04:00
s := shouldBuild(ps.buildFuture, ps.buildExpired, ps.buildDrafts, ps.draft,
hugolib: Refactor page.ShouldBuild and table driven test
2016-05-11 11:45:09 -04:00
ps.publishDate, ps.expiryDate)
if s != ps.out {
t.Errorf("AssertShouldBuild unexpected output with params: %+v", ps)
}
}
}
hugolib: Clean up a benchmark
2017-01-02 05:44:17 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
// "dot" in path: #1885 and #2110
// disablePathToLower regression: #3374
func TestPathIssues(t *testing.T) {
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
t.Parallel()
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
for _, disablePathToLower := range []bool{false, true} {
for _, uglyURLs := range []bool{false, true} {
t.Run(fmt.Sprintf("disablePathToLower=%t,uglyURLs=%t", disablePathToLower, uglyURLs), func(t *testing.T) {
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
cfg, fs := newTestCfg()
th := testHelper{cfg, fs, t}
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
cfg.Set("permalinks", map[string]string{
"post": ":section/:title",
})
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
cfg.Set("uglyURLs", uglyURLs)
cfg.Set("disablePathToLower", disablePathToLower)
cfg.Set("paginate", 1)
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
writeSource(t, fs, filepath.Join("layouts", "_default", "single.html"), "<html><body>{{.Content}}</body></html>")
writeSource(t, fs, filepath.Join("layouts", "_default", "list.html"),
"<html><body>P{{.Paginator.PageNumber}}|URL: {{.Paginator.URL}}|{{ if .Paginator.HasNext }}Next: {{.Paginator.Next.URL }}{{ end }}</body></html>")
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
for i := 0; i < 3; i++ {
writeSource(t, fs, filepath.Join("content", "post", fmt.Sprintf("doc%d.md", i)),
fmt.Sprintf(`---
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
title: "test%d.dot"
tags:
- ".net"
---
# doc1
*some content*`, i))
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
}
writeSource(t, fs, filepath.Join("content", "Blog", "Blog1.md"),
fmt.Sprintf(`---
title: "testBlog"
tags:
- "Blog"
---
# doc1
*some blog content*`))
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
s := buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{})
:sparkles: Implement Page bundling and image handling This commit is not the smallest in Hugo's history. Some hightlights include: * Page bundles (for complete articles, keeping images and content together etc.). * Bundled images can be processed in as many versions/sizes as you need with the three methods `Resize`, `Fill` and `Fit`. * Processed images are cached inside `resources/_gen/images` (default) in your project. * Symbolic links (both files and dirs) are now allowed anywhere inside /content * A new table based build summary * The "Total in nn ms" now reports the total including the handling of the files inside /static. So if it now reports more than you're used to, it is just **more real** and probably faster than before (see below). A site building benchmark run compared to `v0.31.1` shows that this should be slightly faster and use less memory: ```bash ▶ ./benchSite.sh "TOML,num_langs=.*,num_root_sections=5,num_pages=(500|1000),tags_per_page=5,shortcodes,render" benchmark old ns/op new ns/op delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 101785785 78067944 -23.30% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 185481057 149159919 -19.58% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 103149918 85679409 -16.94% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 203515478 169208775 -16.86% benchmark old allocs new allocs delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 532464 391539 -26.47% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1056549 772702 -26.87% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 555974 406630 -26.86% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 1086545 789922 -27.30% benchmark old bytes new bytes delta BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 53243246 43598155 -18.12% BenchmarkSiteBuilding/TOML,num_langs=1,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 105811617 86087116 -18.64% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=500,tags_per_page=5,shortcodes,render-4 54558852 44545097 -18.35% BenchmarkSiteBuilding/TOML,num_langs=3,num_root_sections=5,num_pages=1000,tags_per_page=5,shortcodes,render-4 106903858 86978413 -18.64% ``` Fixes #3651 Closes #3158 Fixes #1014 Closes #2021 Fixes #1240 Updates #3757
2017-07-24 03:00:23 -04:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
require.Len(t, s.RegularPages, 4)
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
pathFunc := func(s string) string {
if uglyURLs {
return strings.Replace(s, "/index.html", ".html", 1)
}
return s
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
}
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
blog := "blog"
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
if disablePathToLower {
blog = "Blog"
}
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
th.assertFileContent(pathFunc("public/"+blog+"/"+blog+"1/index.html"), "some blog content")
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
th.assertFileContent(pathFunc("public/post/test0.dot/index.html"), "some content")
if uglyURLs {
th.assertFileContent("public/post/page/1.html", `canonical" href="/post.html"/`)
th.assertFileContent("public/post.html", `<body>P1|URL: /post.html|Next: /post/page/2.html</body>`)
th.assertFileContent("public/post/page/2.html", `<body>P2|URL: /post/page/2.html|Next: /post/page/3.html</body>`)
} else {
th.assertFileContent("public/post/page/1/index.html", `canonical" href="/post/"/`)
th.assertFileContent("public/post/index.html", `<body>P1|URL: /post/|Next: /post/page/2/</body>`)
th.assertFileContent("public/post/page/2/index.html", `<body>P2|URL: /post/page/2/|Next: /post/page/3/</body>`)
th.assertFileContent("public/tags/.net/index.html", `<body>P1|URL: /tags/.net/|Next: /tags/.net/page/2/</body>`)
}
p := s.RegularPages[0]
if uglyURLs {
require.Equal(t, "/post/test0.dot.html", p.RelPermalink())
} else {
require.Equal(t, "/post/test0.dot/", p.RelPermalink())
}
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
hugolib: Fix disablePathToLower regression Fixes #3374
2017-06-06 03:15:42 -04:00
})
}
hugolib: Refactor/-work the permalink/target path logic This is a pretty fundamental change in Hugo, but absolutely needed if we should have any hope of getting "multiple outputs" done. This commit's goal is to say: * Every file target path is created by `createTargetPath`, i.e. one function for all. * That function takes every page and site parameter into account, to avoid fragile string parsing to uglify etc. later on. * The path creation logic has full test coverage. * All permalinks, paginator URLs etc. are then built on top of that same logic. Fixes #1252 Fixes #2110 Closes #2374 Fixes #1885 Fixes #3102 Fixes #3179 Fixes #1641 Fixes #1989
2017-03-09 13:19:29 -05:00
}
}
hugolib: Clean up a benchmark
2017-01-02 05:44:17 -05:00
func BenchmarkParsePage(b *testing.B) {
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
2017-02-04 22:20:06 -05:00
s := newTestSite(b)
hugolib: Clean up a benchmark
2017-01-02 05:44:17 -05:00
f, _ := os.Open("testdata/redis.cn.md")
var buf bytes.Buffer
buf.ReadFrom(f)
b.ResetTimer()
for i := 0; i < b.N; i++ {
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
2017-02-04 22:20:06 -05:00
page, _ := s.NewPage("bench")
hugolib: Clean up a benchmark
2017-01-02 05:44:17 -05:00
page.ReadFrom(bytes.NewReader(buf.Bytes()))
}
}
Reference in a new issue Copy permalink