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

Merge pull request #5068 from stomar/example-com 

Merge pull request 5068
This commit is contained in:
jekyllbot 2016-07-08 23:23:18 -07:00 committed by GitHub
parent f6dc749332 ba8573c420
commit ac6ba15bae
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/test_configuration.rb
View File

@ -327,10 +327,10 @@ class TestConfiguration < JekyllUnitTest
allow(SafeYAML) allow(SafeYAML)
.to receive(:load_file) .to receive(:load_file)
.with(@paths[:other]) .with(@paths[:other])
.and_return({ "baseurl" => "http://wahoo.dev" }) .and_return({ "baseurl" => "http://example.com" })
allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}") allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
assert_equal \ assert_equal \
site_configuration({ "baseurl" => "http://wahoo.dev" }), site_configuration({ "baseurl" => "http://example.com" }),
Jekyll.configuration(test_config.merge({ "config" => @paths[:other] })) Jekyll.configuration(test_config.merge({ "config" => @paths[:other] }))
end end
@ -378,7 +378,7 @@ class TestConfiguration < JekyllUnitTest
allow(SafeYAML) allow(SafeYAML)
.to receive(:load_file) .to receive(:load_file)
.with(@paths[:other]) .with(@paths[:other])
.and_return({ "baseurl" => "http://wahoo.dev" }) .and_return({ "baseurl" => "http://example.com" })
allow($stdout) allow($stdout)
.to receive(:puts) .to receive(:puts)
.with("Configuration file: #{@paths[:default]}") .with("Configuration file: #{@paths[:default]}")
@ -386,7 +386,7 @@ class TestConfiguration < JekyllUnitTest
.to receive(:puts) .to receive(:puts)
.with("Configuration file: #{@paths[:other]}") .with("Configuration file: #{@paths[:other]}")
assert_equal \ assert_equal \
site_configuration({ "baseurl" => "http://wahoo.dev" }), site_configuration({ "baseurl" => "http://example.com" }),
Jekyll.configuration( Jekyll.configuration(
test_config.merge({ "config" => [@paths[:default], @paths[:other]] }) test_config.merge({ "config" => [@paths[:default], @paths[:other]] })
) )