Don't generate excerpts for non-html pages (#8234)

Merge pull request 8234
This commit is contained in:
Ashwin Maroli 2020-06-08 18:09:50 +05:30 committed by GitHub
parent 0bb04d45c7
commit ee20e844aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 3 deletions

View File

@ -190,7 +190,7 @@ module Jekyll
def excerpt
return if excerpt_separator.empty? || !site.config["page_excerpts"]
return data["excerpt"] unless self.class == Jekyll::Page
return data["excerpt"] unless self.class == Jekyll::Page && html?
data["excerpt"] ||= Jekyll::PageExcerpt.new(self).to_liquid
end

View File

@ -0,0 +1,4 @@
---
---
@import "{{ site.skin | default: 'grid' }}";

View File

@ -816,7 +816,7 @@ class TestFilters < JekyllUnitTest
"The list of grouped items for '' is not an Array."
)
# adjust array.size to ignore symlinked page in Windows
qty = Utils::Platforms.really_windows? ? 16 : 18
qty = Utils::Platforms.really_windows? ? 18 : 20
assert_equal qty, g["items"].size
end
end
@ -1310,7 +1310,7 @@ class TestFilters < JekyllUnitTest
"The list of grouped items for '' is not an Array."
)
# adjust array.size to ignore symlinked page in Windows
qty = Utils::Platforms.really_windows? ? 16 : 18
qty = Utils::Platforms.really_windows? ? 18 : 20
assert_equal qty, g["items"].size
end
end

View File

@ -379,6 +379,13 @@ class TestPage < JekyllUnitTest
test_page = Jekyll::Page.new(configured_site, source_dir, "/contacts", "bar.html")
assert_equal "Contact Information\n", test_page.to_liquid["excerpt"]
end
should "not expose an excerpt for non-html pages even in a configured site" do
configured_site = fixture_site("page_excerpts" => true)
test_page = Jekyll::Page.new(configured_site, source_dir, "assets", "test-styles.scss")
refute_equal ".half { width: 50%; }\n", test_page.to_liquid["excerpt"]
assert_nil test_page.to_liquid["excerpt"]
end
end
context "generated via plugin" do

View File

@ -241,6 +241,8 @@ class TestSite < JekyllUnitTest
properties.html
sitemap.xml
static_files.html
test-styles.css.map
test-styles.scss
trailing-dots...md
)
unless Utils::Platforms.really_windows?