Merge branch 'release/0.8' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/contact_mailer/from_admin_message.rhtml

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/controllers/admin_public_body_controller_spec.rb b/spec/controllers/admin_public_body_controller_spec.rb
index 504ddc5cc..28182a3cd 100644
--- a/spec/controllers/admin_public_body_controller_spec.rb
+++ b/spec/controllers/admin_public_body_controller_spec.rb
@@ -215,6 +215,19 @@ describe AdminPublicBodyController, "when administering public bodies and paying
         PublicBody.count.should == n - 1
     end
 
+    it "doesn't let people with good emergency account credentials log in if the emergency user is disabled" do
+        setup_emergency_credentials('biz', 'fuz')
+        Configuration.stub!(:disable_emergency_user).and_return(true)
+        n = PublicBody.count
+        basic_auth_login(@request, "biz", "fuz")
+        post :show, { :id => public_bodies(:humpadink_public_body).id, :emergency => 1}
+        session[:using_admin].should == nil
+        n = PublicBody.count
+        post :destroy, { :id => public_bodies(:forlorn_public_body).id }
+        session[:using_admin].should == nil
+        PublicBody.count.should == n
+    end
+
     it "allows superusers to do stuff" do
         session[:user_id] = users(:admin_user).id
         @request.env["HTTP_AUTHORIZATION"] = ""