Merge branch 'hotfix/0.11.0.4'

1 files changed, 12 insertions, 0 deletions

diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index 5a766b1e1..1575bc84e 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -159,6 +159,18 @@ describe TrackController, "when viewing RSS feed for a track" do
             get :track_user, :feed => 'feed', :url_name => "there_is_no_such_user"
         }.should raise_error(ActiveRecord::RecordNotFound)
     end
+
+    it 'should return atom/xml for a feed url without format specified, even if the
+        requester prefers json' do
+
+        request.env['HTTP_ACCEPT'] = 'application/json,text/xml'
+        track_thing = track_things(:track_fancy_dog_request)
+
+        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'
+    end
+
 end
 
 describe TrackController, "when viewing JSON version of a track feed" do