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

View File

@@ -85,9 +85,12 @@ class JekyllUnitTest < Minitest::Test
Jekyll::Site.new(site_configuration(overrides))
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)
.fix_common_issues.backwards_compatibilize.add_default_collections
end
def site_configuration(overrides = {})
@@ -97,7 +100,10 @@ class JekyllUnitTest < Minitest::Test
}))
build_configs({
"source" => source_dir
}, full_overrides)
}, full_overrides).
fix_common_issues.
backwards_compatibilize.
add_default_collections
end
def dest_dir(*subdirs)