dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test#build_configs shouldn't overwrite default collections

This commit is contained in:
Parker Moore 2016-04-04 11:49:10 -07:00 committed by Pat Hawks
parent e02049727b
commit c69ca4c11e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/helper.rb
View File

@ -85,9 +85,12 @@ class JekyllUnitTest < Minitest::Test
Jekyll::Site.new(site_configuration(overrides)) Jekyll::Site.new(site_configuration(overrides))
end end
def build_configs(overrides, base_hash = Jekyll::Configuration::DEFAULTS) def default_configuration
Marshal.load(Marshal.dump(Jekyll::Configuration::DEFAULTS))
end
def build_configs(overrides, base_hash = default_configuration)
Utils.deep_merge_hashes(base_hash, overrides) Utils.deep_merge_hashes(base_hash, overrides)
.fix_common_issues.backwards_compatibilize.add_default_collections
end end
def site_configuration(overrides = {}) def site_configuration(overrides = {})
@ -97,7 +100,10 @@ class JekyllUnitTest < Minitest::Test
})) }))
build_configs({ build_configs({
"source" => source_dir "source" => source_dir
}, full_overrides) }, full_overrides).
fix_common_issues.
backwards_compatibilize.
add_default_collections
end end
def dest_dir(*subdirs) def dest_dir(*subdirs)