diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2019-01-02 12:33:26 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2019-03-23 18:51:22 +0100 |
| commit | 597e418cb02883418f2cebb41400e8e61413f651 (patch) | |
| tree | 177ad9c540b2583b6dab138c9f0490d28989c7f7 /hugolib/minify_publisher_test.go | |
| parent | 44f5c1c14cb1f42cc5f01739c289e9cfc83602af (diff) | |
| download | hugo-597e418cb02883418f2cebb41400e8e61413f651.tar.gz hugo-597e418cb02883418f2cebb41400e8e61413f651.zip | |
Make Page an interface
The main motivation of this commit is to add a `page.Page` interface to replace the very file-oriented `hugolib.Page` struct.
This is all a preparation step for issue #5074, "pages from other data sources".
But this also fixes a set of annoying limitations, especially related to custom output formats, and shortcodes.
Most notable changes:
* The inner content of shortcodes using the `{{%` as the outer-most delimiter will now be sent to the content renderer, e.g. Blackfriday.
This means that any markdown will partake in the global ToC and footnote context etc.
* The Custom Output formats are now "fully virtualized". This removes many of the current limitations.
* The taxonomy list type now has a reference to the `Page` object.
This improves the taxonomy template `.Title` situation and make common template constructs much simpler.
See #5074
Fixes #5763
Fixes #5758
Fixes #5090
Fixes #5204
Fixes #4695
Fixes #5607
Fixes #5707
Fixes #5719
Fixes #3113
Fixes #5706
Fixes #5767
Fixes #5723
Fixes #5769
Fixes #5770
Fixes #5771
Fixes #5759
Fixes #5776
Fixes #5777
Fixes #5778
Diffstat (limited to 'hugolib/minify_publisher_test.go')
| -rw-r--r-- | hugolib/minify_publisher_test.go | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/hugolib/minify_publisher_test.go b/hugolib/minify_publisher_test.go index ce183343b..66e674ade 100644 --- a/hugolib/minify_publisher_test.go +++ b/hugolib/minify_publisher_test.go @@ -1,4 +1,4 @@ -// Copyright 2018 The Hugo Authors. All rights reserved. +// Copyright 2019 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. @@ -17,13 +17,10 @@ import ( "testing" "github.com/spf13/viper" - - "github.com/stretchr/testify/require" ) func TestMinifyPublisher(t *testing.T) { t.Parallel() - assert := require.New(t) v := viper.New() v.Set("minify", true) @@ -43,29 +40,24 @@ func TestMinifyPublisher(t *testing.T) { <body id="home"> - <h1>{{ .Page.Title }}</h1> + <h1>{{ .Title }}</h1> + <p>{{ .Permalink }}</p> </body> </html> ` b := newTestSitesBuilder(t) - b.WithViper(v).WithContent("page.md", pageWithAlias) - b.WithTemplates("_default/list.html", htmlTemplate, "_default/single.html", htmlTemplate, "alias.html", htmlTemplate) + b.WithViper(v).WithTemplatesAdded("layouts/index.html", htmlTemplate) b.CreateSites().Build(BuildCfg{}) - assert.Equal(1, len(b.H.Sites)) - require.Len(t, b.H.Sites[0].RegularPages, 1) - // Check minification // HTML - b.AssertFileContent("public/page/index.html", "<!doctype html><html lang=en><head><meta charset=utf-8><title>HTML5 boilerplate – all you really need…</title><link rel=stylesheet href=css/style.css></head><body id=home><h1>Has Alias</h1></body></html>") - // HTML alias. Note the custom template which does no redirect. - b.AssertFileContent("public/foo/bar/index.html", "<!doctype html><html lang=en><head><meta charset=utf-8><title>HTML5 boilerplate ") + b.AssertFileContent("public/index.html", "<!doctype html>") // RSS b.AssertFileContent("public/index.xml", "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?><rss version=\"2.0\" xmlns:atom=\"http://www.w3.org/2005/Atom\"><channel><title/><link>https://example.org/</link>") // Sitemap - b.AssertFileContent("public/sitemap.xml", "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?><urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\"><url><loc>https://example.org/</loc><priority>0</priority></url><url>") + b.AssertFileContent("public/sitemap.xml", "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?><urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\" xmlns:xhtml=\"http://www.w3.org/1999/xhtml\"><url><loc>h") } |