From c69ca4c11eac808a3cc8ec28286fea8a9ce7d7f8 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 4 Apr 2016 11:49:10 -0700 Subject: [PATCH] Test#build_configs shouldn't overwrite default collections --- test/helper.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/helper.rb b/test/helper.rb index 3a3dafa2..37c51d58 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -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)