fix feed tests

git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2325 567b1171-46fb-0310-a4c9-b4bef9110e78
rwdaigle · Oct 4, 2006 · 8d632b8 · 8d632b8
1 parent faaf9bc
commit 8d632b8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -73,7 +73,7 @@ def comment_expiration_options
 
   def sanitize_feed_content(html, sanitize_tables = false)
     options = sanitize_tables ? {:tags => %w(table thead tfoot tbody td tr th)} : {}
-    returning h(white_list(html, options)) do |html|
+    returning h(white_list(html.strip, options)) do |html|
       html.gsub! /&amp;(#\d+);/ do |s|
         "&#{$1};"
       end

diff --git a/app/views/feed/_article.rxml b/app/views/feed/_article.rxml
@@ -16,7 +16,7 @@ xm.entry 'xml:base' => home_url do
   end
   unless article.body_html.blank?
     xm << %{<content type="html">
-            #{sanitize_feed_content article.excerpt_html + article.body_html}
+            #{sanitize_feed_content [article.excerpt_html, article.body_html].compact * "\n"}
           </content>}
   end
 end
diff --git a/test/functional/feed_controller_test.rb b/test/functional/feed_controller_test.rb
@@ -96,12 +96,12 @@ def setup
   end
 
   specify "should not double escape html" do
-    text = @contents.first.get_text.to_s
-    assert text.starts_with("&lt;p&gt;quentin&#8217;s &#8220;welcome&#8221;"), "'#{text.inspect}' was double escaped"
+    text = @contents.first.get_text.to_s.strip
+    assert text.starts_with("welcome summary\n&lt;p&gt;quentin&#8217;s &#8220;welcome&#8221;"), "'#{text.inspect}' was double escaped"
   end
 
   specify "should sanitize content" do
-    text = @contents.first.get_text.to_s
+    text = @contents.first.get_text.to_s.strip
     evil = "<script>hi</script><a onclick=\"foo\" href=\"#\">linkage</a></p>"
     good = "&lt;script>hi&lt;/script><a href='#'>linkage</a></p>"
     assert !text.ends_with(CGI::escapeHTML(evil)), "'#{text.inspect}' was not sanitized"