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 2011-06-15 00:50:37 -05:00
commit fc8be60634
1105 changed files with 14278 additions and 4667 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/functional/wiki_controller_test.rb
View file

@ -123,7 +123,7 @@ class WikiControllerTest < ActionController::TestCase
r = process 'edit', 'web' => 'wiki1', 'id' => 'With : Special /> symbols'
assert_response(:success)
xml = REXML::Document.new(r.body)
xml = REXML::Document.new(r.body.to_str)
form = REXML::XPath.first(xml, '//form')
assert_equal '/wiki1/save/With+%3A+Special+%2F%3E+symbols', form.attributes['action']
end

2
test/unit/page_renderer_test.rb
View file

@ -414,7 +414,7 @@ END_THM
:author => Author.new('DavidHeinemeierHansson'))
assert_equal "<tt>hello</tt> that <span class='newWikiWord'>Smart Engine GUI" +
"<a href='../show/SmartEngineGUI'>?</a></span>\n\n",
"<a href='../show/SmartEngineGUI'>?</a></span>",
x_test_renderer(@revision).display_content
end