Fix rendering of atom feed and set correct content type

2 files changed, 2 insertions, 2 deletions

diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb
index 51e081c88..9b4746bde 100644
--- a/app/controllers/track_controller.rb
+++ b/app/controllers/track_controller.rb
@@ -157,10 +157,10 @@ class TrackController < ApplicationController
     def atom_feed_internal
         @xapian_object = perform_search([InfoRequestEvent], @track_thing.track_query, @track_thing.params[:feed_sortby], nil, 25, 1)
         respond_to do |format|
-            format.atom { render :template => 'track/atom_feed' }
             format.json { render :json => @xapian_object.results.map { |r| r[:model].json_for_api(true,
                     lambda { |t| @template.highlight_and_excerpt(t, @xapian_object.words_to_highlight, 150) }
                 ) } }
+            format.any { render :template => 'track/atom_feed.atom', :layout => false, :content_type => :atom }
         end
     end
 
diff --git a/spec/support/validate_html.rb b/spec/support/validate_html.rb
index 93031ef46..56f384537 100644
--- a/spec/support/validate_html.rb
+++ b/spec/support/validate_html.rb
@@ -45,7 +45,7 @@ if $tempfilecount.nil?
                         # don't validate auto-generated HTML
                         return if @request.query_parameters["action"] == "get_attachment_as_html"
                         # XXX Is there a better way to check this than calling a private method?
-                        return if @response.body.empty?
+                        return if @response.body.strip.empty?
                         # And then if HTML, not a redirect (302, 301)
                         if @response.content_type == "text/html" && ! [301,302,401].include?(@response.response_code)
                             if !is_fragment