diff options
| author | Mark Longair <mhl@pobox.com> | 2013-05-30 11:54:21 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-05-30 11:54:21 +0100 |
| commit | 2c41249670f96b2eb29505108d056af5d6e1cb0d (patch) | |
| tree | 55e36f11be648fabeecff9dca41afcf8c4feb23b | |
| parent | 4c12459577764432159190e02909510a560823e2 (diff) | |
| parent | 46f740275a130c26b68352cba787dd956d9ee8c1 (diff) | |
Merge branch 'rails-3-develop' into release/0.11
| -rw-r--r-- | app/controllers/track_controller.rb | 2 | ||||
| -rw-r--r-- | config/httpd.conf-example | 2 | ||||
| -rw-r--r-- | spec/controllers/track_controller_spec.rb | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb index 9076148c4..40e82e7a4 100644 --- a/app/controllers/track_controller.rb +++ b/app/controllers/track_controller.rb @@ -157,7 +157,7 @@ class TrackController < ApplicationController format.json { render :json => @xapian_object.results.map { |r| r[:model].json_for_api(true, lambda { |t| view_context.highlight_and_excerpt(t, @xapian_object.words_to_highlight, 150) } ) } } - format.any { render :template => 'track/atom_feed.atom', :layout => false, :content_type => :atom } + format.any { render :template => 'track/atom_feed.atom', :layout => false, :content_type => 'application/atom+xml' } end end diff --git a/config/httpd.conf-example b/config/httpd.conf-example index 7d49661ca..1326252f5 100644 --- a/config/httpd.conf-example +++ b/config/httpd.conf-example @@ -51,7 +51,7 @@ RewriteRule ^/request/((\d{1,3})\d*)/(response/\d+/attach/(html/)?\d+/.+) /views # Recommend setting this to 3 or less on servers with 512MB RAM PassengerMaxPoolSize 6 # The RackEnv variable applies to Rails 3 applications, while - # the RailsEnv variable applies to applicatoins for earlier + # the RailsEnv variable applies to applications for earlier # versions of Rails. There doesn't seem to be any harm in # setting both, however. RailsEnv production diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index e9501b1ed..5a766b1e1 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -144,6 +144,7 @@ describe TrackController, "when viewing RSS feed for a track" do get :track_request, :feed => 'feed', :url_title => track_thing.info_request.url_title response.should render_template('track/atom_feed') + response.content_type.should == 'application/atom+xml' # XXX should check it is an atom.builder type being rendered, not sure how to assigns[:xapian_object].matches_estimated.should == 3 |