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

Remove merge conflicts I forgot to fix.

This commit is contained in:
Parker Moore 2016-05-18 11:36:57 -07:00 committed by Pat Hawks
parent 37b93f10dd
commit ad59b6e62a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/test_generated_site.rb
View File

@ -5,7 +5,7 @@ class TestGeneratedSite < JekyllUnitTest
setup do setup do
clear_dest clear_dest
@site = fixture_site(config) @site = fixture_site
@site.process @site.process
@index = File.read(dest_dir("index.html")) @index = File.read(dest_dir("index.html"))
end end
@ -63,10 +63,7 @@ OUTPUT
context "generating limited posts" do context "generating limited posts" do
setup do setup do
clear_dest clear_dest
config = Jekyll::Configuration::DEFAULTS.merge({ "source" => source_dir, @site = fixture_site("limit_posts" => 5)
"destination" => dest_dir,
"limit_posts" => 5 })
@site = fixture_site(config)
@site.process @site.process
@index = File.read(dest_dir("index.html")) @index = File.read(dest_dir("index.html"))
end end
@ -78,14 +75,12 @@ OUTPUT
should "ensure limit posts is 0 or more" do should "ensure limit posts is 0 or more" do
assert_raises ArgumentError do assert_raises ArgumentError do
clear_dest clear_dest
@site = fixture_site("limit_posts" => -1) @site = fixture_site("limit_posts" => -1)
end end
end end
should "acceptable limit post is 0" do should "acceptable limit post is 0" do
clear_dest clear_dest
assert fixture_site("limit_posts" => 0), "Couldn't create a site with limit_posts=0." assert fixture_site("limit_posts" => 0), "Couldn't create a site with limit_posts=0."
end end
end end