github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-04-28 03:01:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix deep_merge_hashes! handling of drops and hashes

Browse Source
This commit is contained in:
Parker Moore
2016-01-15 10:52:18 -08:00
parent 22931f42b8
commit 5d79c55b2c
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/test_utils.rb
View File

@@ -13,7 +13,7 @@ class TestUtils < JekyllUnitTest
merged = Utils.deep_merge_hashes(data, @site.site_payload)
assert merged.is_a? Hash
assert merged["site"].is_a? Drops::SiteDrop
assert_equal data["page"], {}
assert_equal data["page"], merged["page"]
end
should "merge a hash into a drop" do
@@ -22,7 +22,7 @@ class TestUtils < JekyllUnitTest
merged = Utils.deep_merge_hashes(@site.site_payload, data)
assert merged.is_a? Drops::UnifiedPayloadDrop
assert merged["site"].is_a? Drops::SiteDrop
assert_equal data["page"], {}
assert_equal data["page"], merged["page"]
end
end