Fix some minor things in the tests

citos27 · May 24, 2016 · de5970a · de5970a
1 parent d84844c
commit de5970a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
@@ -105,10 +105,9 @@ def configuration(override = Hash.new)
       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
@@ -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