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

Merge pull request #5065 from stomar/fix-test 

Merge pull request 5065
This commit is contained in:
jekyllbot 2016-07-07 08:12:03 -07:00 committed by GitHub
parent 25bff0075c d4c87e3655
commit 8bc104969f
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/test_configuration.rb
View File

@ -329,7 +329,6 @@ class TestConfiguration < JekyllUnitTest
.with(@paths[:other]) .with(@paths[:other])
.and_return({ "baseurl" => "http://wahoo.dev" }) .and_return({ "baseurl" => "http://wahoo.dev" })
allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}") allow($stdout).to receive(:puts).with("Configuration file: #{@paths[:other]}")
Jekyll.configuration({ "config" => @paths[:other] })
assert_equal \ assert_equal \
site_configuration({ "baseurl" => "http://wahoo.dev" }), site_configuration({ "baseurl" => "http://wahoo.dev" }),
Jekyll.configuration(test_config.merge({ "config" => @paths[:other] })) Jekyll.configuration(test_config.merge({ "config" => @paths[:other] }))