From de5970ae55503b0c6fb6bf72464d7fe093b306e3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 18 May 2016 12:49:06 -0700 Subject: [PATCH] Fix some minor things in the tests --- lib/jekyll.rb | 7 +++---- test/test_configuration.rb | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/jekyll.rb b/lib/jekyll.rb index 0d680842..07863517 100644 --- a/lib/jekyll.rb +++ b/lib/jekyll.rb @@ -105,10 +105,9 @@ module Jekyll end # Merge DEFAULTS < _config.yml < override - config = Configuration.from Utils.deep_merge_hashes(config, override).stringify_keys - set_timezone(config['timezone']) if config['timezone'] - - config + Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |config| + set_timezone(config['timezone']) if config['timezone'] + end end # Public: Set the TZ environment variable to use the timezone specified diff --git a/test/test_configuration.rb b/test/test_configuration.rb index 6322835d..08cc3bd9 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -24,7 +24,7 @@ class TestConfiguration < JekyllUnitTest should "add default collections" do result = Configuration.from({}) - assert_equal result["collections"], {"posts" => {"output" => true, "permalink" => "/:categories/:year/:month/:day/:title.html"}} + assert_equal result["collections"], {"posts" => {"output" => true, "permalink" => "/:categories/:year/:month/:day/:title:output_ext"}} end should "NOT backwards-compatibilize" do @@ -325,7 +325,7 @@ class TestConfiguration < JekyllUnitTest "docs" => {}, "posts" => { "output" => true, - "permalink" => "/:categories/:year/:month/:day/:title.html" + "permalink" => "/:categories/:year/:month/:day/:title:output_ext" }}}) end @@ -335,7 +335,7 @@ class TestConfiguration < JekyllUnitTest "collections" => { "posts" => { "output" => true, - "permalink" => "/:categories/:year/:month/:day/:title.html" + "permalink" => "/:categories/:year/:month/:day/:title:output_ext" }}}) end @@ -345,7 +345,7 @@ class TestConfiguration < JekyllUnitTest "collections" => { "posts" => { "output" => true, - "permalink" => "/:categories/:year/:month/:day/:title.html" + "permalink" => "/:categories/:year/:month/:day/:title:output_ext" }}}) end