Fix false positive conflicts for static files in a collection (#9141)
Merge pull request 9141
This commit is contained in:
parent
bb851e235d
commit
6903f0b0f4
|
@ -360,9 +360,13 @@ module Jekyll
|
||||||
end
|
end
|
||||||
|
|
||||||
def each_site_file
|
def each_site_file
|
||||||
|
seen_files = []
|
||||||
%w(pages static_files_to_write docs_to_write).each do |type|
|
%w(pages static_files_to_write docs_to_write).each do |type|
|
||||||
send(type).each do |item|
|
send(type).each do |item|
|
||||||
|
next if seen_files.include?(item)
|
||||||
|
|
||||||
yield item
|
yield item
|
||||||
|
seen_files << item
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -749,5 +749,14 @@ class TestSite < JekyllUnitTest
|
||||||
|
|
||||||
assert_includes site.static_files.map(&:relative_path), "_methods/extensionless_static_file"
|
assert_includes site.static_files.map(&:relative_path), "_methods/extensionless_static_file"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
should "not be revisited in `Site#each_site_file`" do
|
||||||
|
site = fixture_site("collections" => { "methods" => { "output" => true } })
|
||||||
|
site.read
|
||||||
|
|
||||||
|
visited_files = []
|
||||||
|
site.each_site_file { |file| visited_files << file }
|
||||||
|
assert_equal visited_files.count, visited_files.uniq.count
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue