3 files changed, 32 insertions, 9 deletions
diff --git a/spec/controllers/admin_user_controller_spec.rb b/spec/controllers/admin_user_controller_spec.rb
index 60ac6969d..c2d645fd2 100644
--- a/spec/controllers/admin_user_controller_spec.rb
+++ b/spec/controllers/admin_user_controller_spec.rb
@@ -24,13 +24,7 @@ describe AdminUserController, "when administering users" do
         post_redirect = PostRedirect.get_last_post_redirect
         response.should redirect_to(:controller => 'user', :action => 'confirm', :email_token => post_redirect.email_token)
     end
-
-    it "logs in as another user when already logged in as an admin" do
-        session[:user_id] = users(:admin_user).id
-        get :login_as,  :id => users(:bob_smith_user).id
-        post_redirect = PostRedirect.get_last_post_redirect
-        response.should redirect_to(:controller => 'user', :action => 'confirm', :email_token => post_redirect.email_token)
-        session[:user_id].should be_nil
-    end
+    
+    # See also "allows an admin to log in as another user" in spec/integration/admin_spec.rb
 end
 
diff --git a/spec/controllers/request_controller_spec.rb b/spec/controllers/request_controller_spec.rb
index 9018f76fe..9add32f1e 100644
--- a/spec/controllers/request_controller_spec.rb
+++ b/spec/controllers/request_controller_spec.rb
@@ -631,7 +631,7 @@ describe RequestController, "when creating a new request" do
 
     it "should accept a public body parameter" do
         get :new, :public_body_id => @body.id
-        assigns[:info_request].public_body.should == @body    
+        assigns[:info_request].public_body.should == @body
         response.should render_template('new')
     end
 
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index 0dc5db607..5d299caa5 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -183,6 +183,35 @@ describe TrackController, "when viewing JSON version of a track feed" do
 
 end
 
+describe TrackController, "when tracking a public body" do
 
+    integrate_views
+
+    before(:each) do
+        load_raw_emails_data
+        rebuild_xapian_index
+    end
+    
+    it "should work" do
+        geraldine = public_bodies(:geraldine_public_body)
+        get :track_public_body, :feed => 'feed', :url_name => geraldine.url_name
+        response.should be_success
+        response.should render_template('track/atom_feed')
+        tt = assigns[:track_thing]
+        tt.public_body.should == geraldine
+        tt.track_type.should == 'public_body_updates'
+        tt.track_query.should == "requested_from:" + geraldine.url_name
+    end
 
+    it "should filter by event type" do
+        geraldine = public_bodies(:geraldine_public_body)
+        get :track_public_body, :feed => 'feed', :url_name => geraldine.url_name, :event_type => 'sent'
+        response.should be_success
+        response.should render_template('track/atom_feed')
+        tt = assigns[:track_thing]
+        tt.public_body.should == geraldine
+        tt.track_type.should == 'public_body_updates'
+        tt.track_query.should == "requested_from:" + geraldine.url_name + " variety:sent"
+    end
 
+end