diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9be06248..f69767a3 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -102,18 +102,19 @@ class StubUrlGenerator < AbstractUrlGenerator
super(:doesnt_need_controller)
end
- def file_link(mode, name, text, web_name, known_file)
+ def file_link(mode, name, text, web_name, known_file, description)
+ title = CGI::escapeHTML(CGI::unescapeHTML( description || text))
link = CGI.escape(name)
case mode
when :export
- if known_file then %{#{text}}
+ if known_file then %{#{text}}
else %{#{text}} end
when :publish
- if known_file then %{#{text}}
+ if known_file then %{#{text}}
else %{#{text}} end
else
if known_file
- %{#{text}}
+ %{#{text}}
else
%{#{text}?}
end
@@ -142,17 +143,18 @@ class StubUrlGenerator < AbstractUrlGenerator
end
end
- def pic_link(mode, name, text, web_name, known_pic)
+ def pic_link(mode, name, text, web_name, known_pic, description)
+ alt_text = CGI::escapeHTML(CGI::unescapeHTML( description || text))
link = CGI.escape(name)
case mode.to_sym
when :export
- if known_pic then %{}
+ if known_pic then %{
}
else %{
} end
when :publish
- if known_pic then %{
}
+ if known_pic then %{
}
else %{#{text}} end
else
- if known_pic then %{
}
+ if known_pic then %{
}
else %{#{text}?} end
end
end
diff --git a/test/unit/page_renderer_test.rb b/test/unit/page_renderer_test.rb
index 29cad167..17ea2fa8 100644
--- a/test/unit/page_renderer_test.rb
+++ b/test/unit/page_renderer_test.rb
@@ -305,10 +305,10 @@ class PageRendererTest < Test::Unit::TestCase
FileUtils.rm_rf("#{RAILS_ROOT}/public/wiki1/files/*")
@web.wiki_files.create(:file_name => 'square.jpg', :description => 'Square', :content => 'never mind')
assert_markup_parsed_as(
- '