github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-02-04 03:35:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5060 from stomar/stringify-overrides

Browse Source 
Merge pull request 5060
This commit is contained in:
jekyllbot
2016-07-15 17:26:14 -07:00
committed by GitHub
parent 0db1ec339d 1c0f21230d
commit eb88aa330c
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/test_configuration.rb
View File

@@ -334,6 +334,18 @@ class TestConfiguration < JekyllUnitTest
Jekyll.configuration(test_config.merge({ "config" => @paths[:other] }))
end
should "load different config if specified with symbol key" do
allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
allow(SafeYAML)
.to receive(:load_file)
.with(@paths[:other])
.and_return({ "baseurl" => "http://example.com" })
allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
assert_equal \
site_configuration({ "baseurl" => "http://example.com" }),
Jekyll.configuration(test_config.merge({ :config => @paths[:other] }))
end
should "load default config if path passed is empty" do
allow(SafeYAML).to receive(:load_file).with(@paths[:default]).and_return({})
allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:default]}")