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

Fix some minor things in the tests

This commit is contained in:
Parker Moore 2016-05-18 12:49:06 -07:00 committed by Pat Hawks
parent d84844c223
commit de5970ae55
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/jekyll.rb
View File

@ -105,10 +105,9 @@ module Jekyll
end end
# Merge DEFAULTS < _config.yml < override # Merge DEFAULTS < _config.yml < override
config = Configuration.from Utils.deep_merge_hashes(config, override).stringify_keys Configuration.from(Utils.deep_merge_hashes(config, override)).tap do |config|
set_timezone(config['timezone']) if config['timezone'] set_timezone(config['timezone']) if config['timezone']
end
config
end end
# Public: Set the TZ environment variable to use the timezone specified # Public: Set the TZ environment variable to use the timezone specified

8
test/test_configuration.rb
View File

@ -24,7 +24,7 @@ class TestConfiguration < JekyllUnitTest
should "add default collections" do should "add default collections" do
result = Configuration.from({}) 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 end
should "NOT backwards-compatibilize" do should "NOT backwards-compatibilize" do
@ -325,7 +325,7 @@ class TestConfiguration < JekyllUnitTest
"docs" => {}, "docs" => {},
"posts" => { "posts" => {
"output" => true, "output" => true,
"permalink" => "/:categories/:year/:month/:day/:title.html" "permalink" => "/:categories/:year/:month/:day/:title:output_ext"
}}}) }}})
end end
@ -335,7 +335,7 @@ class TestConfiguration < JekyllUnitTest
"collections" => { "collections" => {
"posts" => { "posts" => {
"output" => true, "output" => true,
"permalink" => "/:categories/:year/:month/:day/:title.html" "permalink" => "/:categories/:year/:month/:day/:title:output_ext"
}}}) }}})
end end
@ -345,7 +345,7 @@ class TestConfiguration < JekyllUnitTest
"collections" => { "collections" => {
"posts" => { "posts" => {
"output" => true, "output" => true,
"permalink" => "/:categories/:year/:month/:day/:title.html" "permalink" => "/:categories/:year/:month/:day/:title:output_ext"
}}}) }}})
end end