1 files changed, 22 insertions, 11 deletions

diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index c785960b5..1575bc84e 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -49,15 +49,14 @@ describe TrackController, "when making a new track on a request" do
     it "should save a search track and redirect to the right place" do
         session[:user_id] = @user.id
         @track_thing.should_receive(:save!)
-        get :track_search_query, :query_array => ["bob variety:sent"], :feed => 'track'
+        get :track_search_query, :query_array => "bob variety:sent", :feed => 'track'
         response.should redirect_to(:controller => 'general', :action => 'search', :combined => ["bob", "requests"])
     end
 
 end
 
 describe TrackController, "when sending alerts for a track" do
-    integrate_views
-    include LinkToHelper # for main_url
+    render_views
 
     before(:each) do
         load_raw_emails_data
@@ -66,8 +65,7 @@ describe TrackController, "when sending alerts for a track" do
 
     it "should send alerts" do
         # Don't do clever locale-insertion-unto-URL stuff
-        old_filters = ActionController::Routing::Routes.filters
-        ActionController::Routing::Routes.filters = RoutingFilter::Chain.new
+        RoutingFilter.active = false
 
         # set the time the comment event happened at to within the last week
         ire = info_request_events(:silly_comment_event)
@@ -81,7 +79,7 @@ describe TrackController, "when sending alerts for a track" do
         mail = deliveries[0]
         mail.body.should =~ /Alter your subscription/
         mail.to_addrs.first.to_s.should include(users(:silly_name_user).email)
-        mail.body =~ /(http:\/\/.*\/c\/(.*))/
+        mail.body.to_s =~ /(http:\/\/.*\/c\/(.*))/
         mail_url = $1
         mail_token = $2
 
@@ -105,7 +103,7 @@ describe TrackController, "when sending alerts for a track" do
 
         # Given we can't click the link, check the token is right instead
         post_redirect = PostRedirect.find_by_email_token(mail_token)
-        expected_url = main_url("/user/" + users(:silly_name_user).url_name + "#email_subscriptions") # XXX can't call URL making functions here, what is correct way to do this?
+        expected_url = show_user_url(:url_name => users(:silly_name_user).url_name, :anchor => "email_subscriptions")
         post_redirect.uri.should == expected_url
 
         # Check nothing more is delivered if we try again
@@ -115,7 +113,7 @@ describe TrackController, "when sending alerts for a track" do
         deliveries.size.should == 0
 
         # Restore the routing filters
-        ActionController::Routing::Routes.filters = old_filters
+        RoutingFilter.active = true
     end
 
     it "should send localised alerts" do
@@ -134,7 +132,7 @@ describe TrackController, "when sending alerts for a track" do
 end
 
 describe TrackController, "when viewing RSS feed for a track" do
-    integrate_views
+    render_views
 
     before(:each) do
         load_raw_emails_data
@@ -146,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
@@ -160,11 +159,23 @@ 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
 
-    integrate_views
+    render_views
 
     before(:each) do
         load_raw_emails_data
@@ -206,7 +217,7 @@ end
 
 describe TrackController, "when tracking a public body" do
 
-    integrate_views
+    render_views
 
     before(:each) do
         load_raw_emails_data