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

Fix Broken Test

Browse source 
Was not picking up user-supplied alt text in [[filename|Alt text:pic]].
Fixed.
This commit is contained in:
Jacques Distler 2007-10-09 11:02:44 -05:00
parent 402de89abf
commit fbdf4c5dfe
2 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
test/test_helper.rb
View file

@ -102,8 +102,7 @@ class StubUrlGenerator < AbstractUrlGenerator
super(:doesnt_need_controller)
end
def file_link(mode, name, text, web_name, known_file, description)
title = CGI::escapeHTML(CGI::unescapeHTML( description || text))
def file_link(mode, name, text, web_name, known_file)
link = CGI.escape(name)
case mode
when :export
@ -143,18 +142,18 @@ class StubUrlGenerator < AbstractUrlGenerator
end
end
def pic_link(mode, name, text, web_name, known_pic, description)
alt_text = CGI::escapeHTML(CGI::unescapeHTML( description || text))
def pic_link(mode, name, text, web_name, known_pic)
link = CGI.escape(name)
text = CGI.escapeHTML(CGI.unescapeHTML(text || :description))
case mode.to_sym
when :export
if known_pic then %{<img alt="#{alt_text}" src="#{link}" />}
if known_pic then %{<img alt="#{text}" src="#{link}" />}
else %{<img alt="#{text}" src="no image" />} end
when :publish
if known_pic then %{<img alt="#{alt_text}" src="#{link}" />}
if known_pic then %{<img alt="#{text}" src="#{link}" />}
else %{<span class="newWikiWord">#{text}</span>} end
else
if known_pic then %{<img alt="#{alt_text}" src="../file/#{link}" />}
if known_pic then %{<img alt="#{text}" src="../file/#{link}" />}
else %{<span class="newWikiWord">#{text}<a href="../file/#{link}">?</a></span>} end
end
end