deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-06-04 21:39:02 -05:00
commit c4e2afa01a
36 changed files with 1871 additions and 3100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/functional/wiki_controller_test.rb
View file

@ -955,7 +955,7 @@ class WikiControllerTest < ActionController::TestCase
end
def test_recursive_include
@wiki.write_page('wiki1', 'HomePage', 'Self-include: [[!include HomePage]]', Time.now,
@wiki.write_page('wiki1', 'HomePage', "Self-include:\n\n [[!include HomePage]] ", Time.now,
Author.new('AnotherAuthor', '127.0.0.2'), x_test_renderer)
r = process('show', 'id' => 'HomePage', 'web' => 'wiki1')