Merge remote branch 'jlecour/master'

Conflicts:
	lib/jekyll/page.rb
This commit is contained in:
Tom Preston-Werner 2010-11-17 15:25:55 -06:00
commit 4afee1bda1
2 changed files with 22 additions and 5 deletions

8
test/source/.htaccess Normal file
View File

@ -0,0 +1,8 @@
---
layout: nil
---
ErrorDocument 404 /404.html
ErrorDocument 500 /500.html
{% for post in site.posts %}
# {{ post.url }}
{% endfor %}

View File

@ -102,6 +102,15 @@ class TestPage < Test::Unit::TestCase
assert File.directory?(dest_dir)
assert File.exists?(File.join(dest_dir,'sitemap.xml'))
end
should "write dotfiles properly" do
page = setup_page('.htaccess')
do_render(page)
page.write(dest_dir)
assert File.directory?(dest_dir)
assert File.exists?(File.join(dest_dir, '.htaccess'))
end
end
end